git merge conflict resolution?

Joe Perches· Sep 25, 2009, 01:18 UTC · lore

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.

Patch 1: ====================

On Fri, 2009-09-25 at 01:01 +0000, Linux Kernel Mailing List wrote:

Show 23 quoted lines

> Gitweb:     http://git.kernel.org/linus/784546839fd45de485b9e9e4cd072b9d53100aa5
> Commit:     784546839fd45de485b9e9e4cd072b9d53100aa5
> Parent:     07198871dac00e9c250d647e1976d7aee527b805
>     ARM: Update mailing list addresses
>     The old list has now been closed off; update the now invalid addresses.
>     Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> ---
>  MAINTAINERS |  106 +++++++++++++++++++++++++++++-----------------------------
>  1 files changed, 53 insertions(+), 53 deletions(-)
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 837b598..12be157 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -497,7 +497,7 @@ F:	arch/arm/include/asm/floppy.h
>  
>  ARM PORT
>  M:	Russell King <linux@arm.linux.org.uk>
> -L:	linux-arm-kernel@lists.arm.linux.org.uk	(subscribers-only)
> +L:	linux-arm-kernel@lists.infradead.org
>  W:	http://www.arm.linux.org.uk/
>  S:	Maintained
>  F:	arch/arm/

====================

vs the patch that was applied a bit earlier:

Patch 2: ====================

commit efc03ecb9d674588a13aee27289c2af2afe5e6b4
Author: Joe Perches <joe@perches.com>
Date:   Mon Sep 21 17:04:27 2009 -0700

    MAINTAINERS: move ARM lists to infradead

====================

Patch 2 was applied before patch 1.

Russell's patch removes the "(moderated for non-subscribers)" from each entry, yet the final result includes it.

Can someone help me understand why?

Björn Steinbrink· Sep 25, 2009, 09:58 UTC · re: Joe Perches · lore

Re: git merge conflict resolution?

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