From: "Björn Steinbrink" <B.Steinbrink@gmx.de>
To: Joe Perches <joe@perches.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
git@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Russell King <rmk+kernel@arm.linux.org.uk>
Subject: Re: git merge conflict resolution?
Date: Fri, 25 Sep 2009 11:58:31 +0200 [thread overview]
Message-ID: <20090925095831.GA17721@atjola.homenet> (raw)
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
prev parent reply other threads:[~2009-09-25 9:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <200909250101.n8P11HwO030173@hera.kernel.org>
2009-09-25 1:18 ` git merge conflict resolution? Joe Perches
2009-09-25 9:58 ` Björn Steinbrink [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090925095831.GA17721@atjola.homenet \
--to=b.steinbrink@gmx.de \
--cc=git@vger.kernel.org \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).