From: Ricky Egeland <rickyegeland@linea.gov.br>
Date: Sun, 31 Jul 2011 21:44:43 GMT
Subject: Re: Cleaning up history with git rebase
Message-ID: <317AAE40-449B-4280-AEF1-10EE93FDB9FF@linea.gov.br>
In-Reply-To: <CAMOZ1BvRDSkzJmASNFQvZ-SVBUXZHw6CyfLP4SJqK8CwaMMDUA@mail.gmail.com>


On Jul 31, 2011, at 6:33 PM, Michael Witten wrote:

> On Sun, Jul 31, 2011 at 20:21, Michael Witten <mfwitten@gmail.com> wrote:
>> Why are there conflicts anyway?
> 
> Oh...
> 
> I guess there were conflicts when the merge commit was made in the
> original repository, and these conflicts were resolved by the merge
> commit itself. Hence, when rebase tries to split up a merge by dealing
> with just the non-merge parents, you end up having to deal with the
> conflict again.

Yes, I thought it was something like this going on, too.  In the pre-rebase history, when there is a commit with "Conflict:" and listing file which is in the sub-repository history, this is a point where rebase stops with a conflict.

> Shouldn't rebase take this into account?

Not sure.  Seems that it does not, it makes me resolve the conflict again.

-- Ricky