I am sorry to post this on github's group, but seriously I don't know
where I can go.
here's the thing .
I work at the project host by a svn, and locally I use git-svn to
integration it. the probelm is when I run git svn fetch; git svn
rebase, it shows me a error. and I diff the file and solve the problem
(text is overlap), but when I run git rebase --continue. all so a
problem there. follow the prompt, run git add . and try git rebase --
continue again! Oop! problem is still there. try git status, seems
nothing here... what's wrong there?
I know, I know. the problem might stupid to you ,but it does a trouble
to me. little programmer needs some help!
----------------
rebase refs/remotes/experimental: command returned error: 1
n...@nn:~/imigu$ git diff
diff --cc app/views/layouts/index.html.erb
index b6092da,ce476f3..0000000
--- a/app/views/layouts/index.html.erb
+++ b/app/views/layouts/index.html.erb
@@@ -42,7 -42,7 +42,11 @@@
<% end -%>
</ul>
<% else -%>
++<<<<<<< HEAD:app/views/layouts/index.html.erb
+ <span class="nothing">nothing</span>
++=======
+ <span class="nothing">nothing</span>
++>>>>>>> add a nothing css style:app/views/layouts/index.html.erb
<% end -%>
</div>
</div>
n...@nn:~/forum$ vim app/views/layouts/index.html.erb
n...@nn:~/imigu$ git rebase --continue
You must edit all merge conflicts and then
mark them as resolved using git add
n...@nn:~/forum$ git add .
n...@nn:~/forum$ git rebase --continue
Applying: add a nothing span
No changes - did you forget to use 'git add'?
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --
skip".
To restore the original branch and stop rebasing run "git rebase --
abort".
n...@nn:~/forum$ git status
# Not currently on any branch.
nothing to commit (working directory clean)
n...@nn:~/forum$ git diff
n...@nn:~/forum$ git branch -a
* (no branch)
master
forum
forum-orignal
trunk
n...@nn:~/forum$ git rebase --continue
Applying: add a nothing span
No changes - did you forget to use 'git add'?
When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --
skip".
To restore the original branch and stop rebasing run "git rebase --
abort".
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"GitHub" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/github?hl=en
-~----------~----~----~----~------~----~------~--~---
