Re: Cleaning up history with git rebase
On Jul 31, 2011, at 6:33 PM, Michael Witten wrote:
Show 10 quoted lines
> 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