# what's wrong wtih my rebase? (git-svn)
2 messages from 2009-08-05 to 2009-08-05. Participants: G.zhen.ning, Adam Brewster.
Thread: https://gitlist.dev/t/20378
## G.zhen.ning, 2009-08-05 01:47
Subject: what's wrong wtih my rebase? (git-svn)
Message-ID: <44ceb8150908041847mbf7d238r60a59ee40ef6e232@mail.gmail.com>
URL: https://gitlist.dev/e/44ceb8150908041847mbf7d238r60a59ee40ef6e232%40mail.gmail.com
```
git svn fetch
git svn rebase
git diff
vim my.html.erb (resolve the conflict)
git rebase --continue
problem still there.
little programmer needs some help.
---------------------------
rebase refs/remotes/stream: command returned error: 1
nn@nn:~/forum$ git diff
diff --cc app/views/layouts/my.html.erb
index b6092da,ce476f3..0000000
--- a/app/views/layouts/my.html.erb
+++ b/app/views/layouts/my.html.erb
@@@ -42,7 -42,7 +42,11 @@@
<% end -%>
<% else -%>
++<<<<<<< HEAD:app/views/layouts/my.html.erb
+ nothing
++=======
+ nothing
++>>>>>>> add a nothing css style:app/views/layouts/my.html.erb
<% end -%>
nn@nn:~/forum$ vim app/views/layouts/my.html.erb
nn@nn:~/forum$ git rebase --continue
You must edit all merge conflicts and then
mark them as resolved using git add
nn@nn:~/forum$ git add .
nn@nn:~/forum$ git rebase --continue
Applying: add a nothing css style
No changes - did you forget to use 'git add'?
```
## Adam Brewster, 2009-08-05 03:46
Subject: Re: what's wrong wtih my rebase? (git-svn)
Message-ID:
URL: https://gitlist.dev/e/c376da900908042046p1ae1a59dr6bc50fa7812a1968%40mail.gmail.com
In-Reply-To: <44ceb8150908041847mbf7d238r60a59ee40ef6e232@mail.gmail.com>
```
On Tue, Aug 4, 2009 at 9:47 PM, G.zhen.ning wrote:
> git svn fetch
> git svn rebase
> git diff
> vim my.html.erb (resolve the conflict)
? git add html.erb # (tell git you resolved the conflict)
> git rebase --continue
>
```