what's wrong wtih my rebase? (git-svn)

G.zhen.ning· Aug 5, 2009, 01:47 UTC · lore

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 -%>
              </ul>
            <% else -%>
++<<<<<<< HEAD:app/views/layouts/my.html.erb
 +          <span class="nothing">nothing</span>
++=======
+       <span class="nothing">nothing</span>
++>>>>>>> add a nothing css style:app/views/layouts/my.html.erb
            <% end -%>
            </div>
          </div>
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· Aug 5, 2009, 03:46 UTC · re: G.zhen.ning · lore

Re: what's wrong wtih my rebase? (git-svn)

On Tue, Aug 4, 2009 at 9:47 PM, G.zhen.ning<g.zhen.ning@gmail.com> 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
>