Re: git merge conflict resolution?

From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Sep 25, 2009, 09:58 UTC
Message-ID: <20090925095831.GA17721@atjola.homenet>
In-Reply-To: <1253841510.18126.10.camel@Joe-Laptop.home>

On 2009.09.24 18:18:30 -0700, Joe Perches wrote:

> Question about how git does merge conflict resolution.
> 
> This patch doesn't really apply, and the results after the
> patch aren't what at least I expect.

[...]

> Russell's patch removes the "(moderated for non-subscribers)"
> from each entry, yet the final result includes it.
> 
> Can someone help me understand why?

If you look at baea7b946f00a291b166ccae7fcfed6c01530cc6, you see:

    Merge branch 'origin' into for-linus

    Conflicts:
        MAINTAINERS

Git was unable to automatically merge that file, as there were conflicting changes. That merge was done by Russel King, and _he_ decided that the result should include the "(moderated for ...)" part.

Björn