{"thread":{"id":"21048","subject":"git merge conflict resolution?","startedAt":"2009-09-25T01:18:30Z","lastAt":"2009-09-25T09:58:31Z","messageCount":2,"participants":["Joe Perches","Björn Steinbrink"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"123751","messageId":"1253841510.18126.10.camel@Joe-Laptop.home","threadId":"21048","inReplyTo":"200909250101.n8P11HwO030173@hera.kernel.org","subject":"git merge conflict resolution?","fromName":"Joe Perches","fromEmail":"joe@perches.com","sentAt":"2009-09-25T01:18:30Z","receivedAt":"2009-09-25T01:18:30Z","isPatch":false,"sender":{"key":"joe@perches.com","avatar":"https://avatars.githubusercontent.com/u/13122723?v=4"},"body":"Question about how git does merge conflict resolution.\n\nThis patch doesn't really apply, and the results after the\npatch aren't what at least I expect.\n\nPatch 1: ====================\n\nOn Fri, 2009-09-25 at 01:01 +0000, Linux Kernel Mailing List wrote:\n> Gitweb:     http://git.kernel.org/linus/784546839fd45de485b9e9e4cd072b9d53100aa5\n> Commit:     784546839fd45de485b9e9e4cd072b9d53100aa5\n> Parent:     07198871dac00e9c250d647e1976d7aee527b805\n>     ARM: Update mailing list addresses\n>     The old list has now been closed off; update the now invalid addresses.\n>     Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>\n> ---\n>  MAINTAINERS |  106 +++++++++++++++++++++++++++++-----------------------------\n>  1 files changed, 53 insertions(+), 53 deletions(-)\n> \n> diff --git a/MAINTAINERS b/MAINTAINERS\n> index 837b598..12be157 100644\n> --- a/MAINTAINERS\n> +++ b/MAINTAINERS\n> @@ -497,7 +497,7 @@ F:\tarch/arm/include/asm/floppy.h\n>  \n>  ARM PORT\n>  M:\tRussell King <linux@arm.linux.org.uk>\n> -L:\tlinux-arm-kernel@lists.arm.linux.org.uk\t(subscribers-only)\n> +L:\tlinux-arm-kernel@lists.infradead.org\n>  W:\thttp://www.arm.linux.org.uk/\n>  S:\tMaintained\n>  F:\tarch/arm/\n\n====================\n\nvs the patch that was applied a bit earlier:\n\nPatch 2: ====================\n\ncommit efc03ecb9d674588a13aee27289c2af2afe5e6b4\nAuthor: Joe Perches <joe@perches.com>\nDate:   Mon Sep 21 17:04:27 2009 -0700\n\n    MAINTAINERS: move ARM lists to infradead\n\n====================\n\nPatch 2 was applied before patch 1.\n\nRussell's patch removes the \"(moderated for non-subscribers)\"\nfrom each entry, yet the final result includes it.\n\nCan someone help me understand why?\n"},{"id":"123764","messageId":"20090925095831.GA17721@atjola.homenet","threadId":"21048","inReplyTo":"1253841510.18126.10.camel@Joe-Laptop.home","subject":"Re: git merge conflict resolution?","fromName":"Björn Steinbrink","fromEmail":"b.steinbrink@gmx.de","sentAt":"2009-09-25T09:58:31Z","receivedAt":"2009-09-25T09:58:31Z","isPatch":false,"sender":{"key":"b.steinbrink@gmx.de","avatar":"https://avatars.githubusercontent.com/u/230962?v=4"},"body":"On 2009.09.24 18:18:30 -0700, Joe Perches wrote:\n> Question about how git does merge conflict resolution.\n> \n> This patch doesn't really apply, and the results after the\n> patch aren't what at least I expect.\n[...]\n> Russell's patch removes the \"(moderated for non-subscribers)\"\n> from each entry, yet the final result includes it.\n> \n> Can someone help me understand why?\n\nIf you look at baea7b946f00a291b166ccae7fcfed6c01530cc6, you see:\n\n    Merge branch 'origin' into for-linus\n\n    Conflicts:\n        MAINTAINERS\n\nGit was unable to automatically merge that file, as there were\nconflicting changes. That merge was done by Russel King, and _he_\ndecided that the result should include the \"(moderated for ...)\" part.\n\nBjörn\n"}]}