threads / discuss / 2583

git rebase conflict help?

Subject: git rebase conflict help?

## tl;dr

3 messages between Nov 17, 2005 and Nov 18, 2005.

replies: 2people: 3as markdown or json

Kevin Geiss· Nov 17, 2005, 22:20 UTC · lore

I fetched my origin branch, then tried to run 'git rebase origin'. one of my commits from master which is not yet in origin got a conflict, so git rebase origin told me that the Simple cherry-pick failed, and the Automatic cherry-pick got conflicts. and it saved the commit message for me in .msg and my offending commit's id in .rebase- tmp32409.

I'm not sure how to proceed from here. actually, I know what the offending changes are, and I could re-do the changes by hand and commit them again, but I'd like to know what git tools I'm supposed to use in this case...

thanks.

Junio C Hamano· Nov 17, 2005, 23:21 UTC · re: Kevin Geiss · lore

Re: git rebase conflict help?

Kevin Geiss <kevin@desertsol.com> writes:

Show 6 quoted lines

> I fetched my origin branch, then tried to run 'git rebase origin'.  
> one of my commits from master which is not yet in origin got a  
> conflict, so git rebase origin told me that the Simple cherry-pick  
> failed, and the Automatic cherry-pick got conflicts. and it saved the  
> commit message for me in .msg and my offending commit's id in .rebase- 
> tmp32409.

Sorry, the tool support for this situation is very poor in the original rebase code.

With the tool you have, you need to make sure that the working tree matches the (halfway) rebased master's head, and run "git-cherry-pick --replay $commit" on the offending commits stored in .rebase-tmp$$, one by one.

Franck Bui-Huu· Nov 18, 2005, 08:04 UTC · re: Kevin Geiss · lore

Re: git rebase conflict help?

Kevin Geiss wrote:

Show 12 quoted lines

> I fetched my origin branch, then tried to run 'git rebase origin'.  
> one of my commits from master which is not yet in origin got a  
> conflict, so git rebase origin told me that the Simple cherry-pick  
> failed, and the Automatic cherry-pick got conflicts. and it saved the  
> commit message for me in .msg and my offending commit's id in .rebase- 
> tmp32409.
>
> I'm not sure how to proceed from here. actually, I know what the  
> offending changes are, and I could re-do the changes by hand and  
> commit them again, but I'd like to know what git tools I'm supposed  
> to use in this case...
>

You can take a look at this: http://www.gelato.unsw.edu.au/archives/git/0508/7789.html

              Franck