From: Michael Witten <mfwitten@gmail.com>
Date: Sun, 31 Jul 2011 21:33:51 GMT
Subject: Re: Cleaning up history with git rebase
Message-ID: <CAMOZ1BvRDSkzJmASNFQvZ-SVBUXZHw6CyfLP4SJqK8CwaMMDUA@mail.gmail.com>
In-Reply-To: <34ca77f818944acb9f5c6f19d91df73f-mfwitten@gmail.com>

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.

Shouldn't rebase take this into account?