{"thread":{"id":"2583","subject":"git rebase conflict help?","startedAt":"2005-11-17T22:20:25Z","lastAt":"2005-11-18T08:04:28Z","messageCount":3,"participants":["Kevin Geiss","Junio C Hamano","Franck Bui-Huu"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"12153","messageId":"33D6F7FB-7864-471B-A111-9991C768577A@desertsol.com","threadId":"2583","inReplyTo":null,"subject":"git rebase conflict help?","fromName":"Kevin Geiss","fromEmail":"kevin@desertsol.com","sentAt":"2005-11-17T22:20:25Z","receivedAt":"2005-11-17T22:20:25Z","isPatch":false,"sender":{"key":"kevin@desertsol.com","avatar":null},"body":"I fetched my origin branch, then tried to run 'git rebase origin'.  \none of my commits from master which is not yet in origin got a  \nconflict, so git rebase origin told me that the Simple cherry-pick  \nfailed, and the Automatic cherry-pick got conflicts. and it saved the  \ncommit message for me in .msg and my offending commit's id in .rebase- \ntmp32409.\n\nI'm not sure how to proceed from here. actually, I know what the  \noffending changes are, and I could re-do the changes by hand and  \ncommit them again, but I'd like to know what git tools I'm supposed  \nto use in this case...\n\nthanks.\n"},{"id":"12161","messageId":"7voe4isvwp.fsf@assigned-by-dhcp.cox.net","threadId":"2583","inReplyTo":"33D6F7FB-7864-471B-A111-9991C768577A@desertsol.com","subject":"Re: git rebase conflict help?","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-17T23:21:26Z","receivedAt":"2005-11-17T23:21:26Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Kevin Geiss <kevin@desertsol.com> writes:\n\n> I fetched my origin branch, then tried to run 'git rebase origin'.  \n> one of my commits from master which is not yet in origin got a  \n> conflict, so git rebase origin told me that the Simple cherry-pick  \n> failed, and the Automatic cherry-pick got conflicts. and it saved the  \n> commit message for me in .msg and my offending commit's id in .rebase- \n> tmp32409.\n\nSorry, the tool support for this situation is very poor in the\noriginal rebase code.\n\nWith the tool you have, you need to make sure that the working\ntree matches the (halfway) rebased master's head, and run\n\"git-cherry-pick --replay $commit\" on the offending commits\nstored in .rebase-tmp$$, one by one.\n"},{"id":"12204","messageId":"437D8B0C.3010608@innova-card.com","threadId":"2583","inReplyTo":"33D6F7FB-7864-471B-A111-9991C768577A@desertsol.com","subject":"Re: git rebase conflict help?","fromName":"Franck Bui-Huu","fromEmail":"franck.bui-huu@innova-card.com","sentAt":"2005-11-18T08:04:28Z","receivedAt":"2005-11-18T08:04:28Z","isPatch":false,"sender":{"key":"franck.bui-huu@innova-card.com","avatar":null},"body":"Kevin Geiss wrote:\n\n> I fetched my origin branch, then tried to run 'git rebase origin'.  \n> one of my commits from master which is not yet in origin got a  \n> conflict, so git rebase origin told me that the Simple cherry-pick  \n> failed, and the Automatic cherry-pick got conflicts. and it saved the  \n> commit message for me in .msg and my offending commit's id in .rebase- \n> tmp32409.\n>\n> I'm not sure how to proceed from here. actually, I know what the  \n> offending changes are, and I could re-do the changes by hand and  \n> commit them again, but I'd like to know what git tools I'm supposed  \n> to use in this case...\n>\nYou can take a look at this:\nhttp://www.gelato.unsw.edu.au/archives/git/0508/7789.html\n\n              Franck\n"}]}