Re: git rebase conflict help?

From: Junio C Hamano <junkio@cox.net>
Date: Nov 17, 2005, 23:21 UTC
Message-ID: <7voe4isvwp.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <33D6F7FB-7864-471B-A111-9991C768577A@desertsol.com>

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.