{"thread":{"id":"20378","subject":"what's wrong wtih my rebase? (git-svn)","startedAt":"2009-08-05T01:47:09Z","lastAt":"2009-08-05T03:46:01Z","messageCount":2,"participants":["G.zhen.ning","Adam Brewster"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"119546","messageId":"44ceb8150908041847mbf7d238r60a59ee40ef6e232@mail.gmail.com","threadId":"20378","inReplyTo":null,"subject":"what's wrong wtih my rebase? (git-svn)","fromName":"G.zhen.ning","fromEmail":"g.zhen.ning@gmail.com","sentAt":"2009-08-05T01:47:09Z","receivedAt":"2009-08-05T01:47:09Z","isPatch":false,"sender":{"key":"g.zhen.ning@gmail.com","avatar":null},"body":"git svn fetch\ngit svn rebase\ngit diff\nvim my.html.erb                (resolve the conflict)\ngit rebase --continue\n\nproblem still there.\n\nlittle programmer needs some help.\n---------------------------\nrebase refs/remotes/stream: command returned error: 1\n\nnn@nn:~/forum$ git diff\ndiff --cc app/views/layouts/my.html.erb\nindex b6092da,ce476f3..0000000\n--- a/app/views/layouts/my.html.erb\n+++ b/app/views/layouts/my.html.erb\n@@@ -42,7 -42,7 +42,11 @@@\n              <% end -%>\n              </ul>\n            <% else -%>\n++<<<<<<< HEAD:app/views/layouts/my.html.erb\n +          <span class=\"nothing\">nothing</span>\n++=======\n+       <span class=\"nothing\">nothing</span>\n++>>>>>>> add a nothing css style:app/views/layouts/my.html.erb\n            <% end -%>\n            </div>\n          </div>\nnn@nn:~/forum$ vim app/views/layouts/my.html.erb\nnn@nn:~/forum$ git rebase --continue\nYou must edit all merge conflicts and then\nmark them as resolved using git add\nnn@nn:~/forum$ git add .\nnn@nn:~/forum$ git rebase --continue\nApplying: add a nothing css style\nNo changes - did you forget to use 'git add'?\n"},{"id":"119555","messageId":"c376da900908042046p1ae1a59dr6bc50fa7812a1968@mail.gmail.com","threadId":"20378","inReplyTo":"44ceb8150908041847mbf7d238r60a59ee40ef6e232@mail.gmail.com","subject":"Re: what's wrong wtih my rebase? (git-svn)","fromName":"Adam Brewster","fromEmail":"adambrewster@gmail.com","sentAt":"2009-08-05T03:46:01Z","receivedAt":"2009-08-05T03:46:01Z","isPatch":false,"sender":{"key":"adambrewster@gmail.com","avatar":"https://avatars.githubusercontent.com/u/223816?v=4"},"body":"On Tue, Aug 4, 2009 at 9:47 PM, G.zhen.ning<g.zhen.ning@gmail.com> wrote:\n> git svn fetch\n> git svn rebase\n> git diff\n> vim my.html.erb                (resolve the conflict)\n\n? git add html.erb   # (tell git you resolved the conflict)\n\n> git rebase --continue\n>\n"}]}