From: Catalin Marinas <catalin.marinas@arm.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Jeff Garzik <jgarzik@pobox.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Linux Kernel list <linux-kernel@vger.kernel.org>,
James Bottomley <James.Bottomley@SteelEye.com>,
David Woodhouse <dwmw2@infradead.org>
Subject: Re: New SCM and commit list
Date: Tue, 12 Apr 2005 10:52:22 +0100 [thread overview]
Message-ID: <tnx64ys8gq1.fsf@arm.com> (raw)
In-Reply-To: <Pine.LNX.4.58.0504102304050.1267@ppc970.osdl.org> (Linus Torvalds's message of "Sun, 10 Apr 2005 23:15:20 -0700 (PDT)")
Linus Torvalds <torvalds@osdl.org> wrote:
> So anything that got modified in just one tree obviously merges to that
> version. Any file that got modified in two trees will end up just being
> passed to the "merge" program. See "man merge" and "man diff3". The merger
> gets to fix up any conflicts by hand.
"merge" does a better job than "diff3" since it can resolve the
conflicts caused by similar changes to a "parent" file (this is
available in both BK and GNU Arch). This is useful when you try to
merge 2 branches that both include a patch which is not under the
revision control. It also solves the conflicts caused by
cherry-picking changes (just need to find the last consecutive common
changeset as the common ancestor).
--
Catalin
next prev parent reply other threads:[~2005-04-12 9:53 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-10 23:10 New SCM and commit list Benjamin Herrenschmidt
2005-04-10 23:26 ` Linus Torvalds
2005-04-11 3:25 ` James Bottomley
2005-04-11 20:53 ` Greg KH
2005-04-11 21:26 ` Linus Torvalds
2005-04-11 21:31 ` James Bottomley
2005-04-12 4:24 ` Arjan van de Ven
2005-04-13 20:04 ` H. Peter Anvin
2005-04-11 5:53 ` Jeff Garzik
2005-04-11 6:15 ` Linus Torvalds
2005-04-11 6:40 ` Ryan Anderson
2005-04-11 6:47 ` Geert Uytterhoeven
2005-04-11 7:38 ` Ingo Molnar
2005-04-11 12:51 ` Chris Mason
2005-04-11 19:32 ` Chris Mason
2005-04-11 22:50 ` Daniel Barkalow
2005-04-12 8:36 ` Geert Uytterhoeven
2005-04-12 9:52 ` Catalin Marinas [this message]
2005-04-16 8:35 ` Paul Jackson
2005-04-18 8:18 ` Catalin Marinas
2005-04-11 7:13 ` David Woodhouse
-- strict thread matches above, loose matches on Subject: below --
2005-04-11 18:18 Adam J. Richter
2005-04-12 3:02 Adam J. Richter
2005-04-12 21:54 ` Daniel Barkalow
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=tnx64ys8gq1.fsf@arm.com \
--to=catalin.marinas@arm.com \
--cc=James.Bottomley@SteelEye.com \
--cc=benh@kernel.crashing.org \
--cc=dwmw2@infradead.org \
--cc=jgarzik@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.