From: Franck Bui-Huu <franck.bui-huu@innova-card.com>
Date: Fri, 18 Nov 2005 08:04:28 GMT
Subject: Re: git rebase conflict help?
Message-ID: <437D8B0C.3010608@innova-card.com>
In-Reply-To: <33D6F7FB-7864-471B-A111-9991C768577A@desertsol.com>

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