git rebase conflict help?

git rebase conflict help?

[Kevin Geiss]

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.

Re: git rebase conflict help?

[Junio C Hamano]

Kevin Geiss <kevin@desertsol.com> writes:

> 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.

Re: git rebase conflict help?

[Franck Bui-Huu]

Kevin Geiss wrote:

> 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