From: Junio C Hamano <gitster@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Perrin Meyer <perrinmeyer@yahoo.com>, git@vger.kernel.org
Subject: Re: [PATCH] Fix read-tree merging more than 3 trees using 3-way merge
Date: Thu, 16 Aug 2007 19:14:47 -0700 [thread overview]
Message-ID: <7vbqd6j4a0.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.LFD.0.999.0708161750550.30176@woody.linux-foundation.org> (Linus Torvalds's message of "Thu, 16 Aug 2007 17:59:18 -0700 (PDT)")
Linus Torvalds <torvalds@linux-foundation.org> writes:
> Sorry. I didn't even realize people did this. Oops.
This is no big deal. It would have triggered if you are using
resolve strategy _and_ did a multi merge-base merge, the former
of which is quite unusual these days.
> What *is* the behaviour for four trees? Reading "unpack_trees()" source
> implies that all other trees go into stage 1, where the first matching
> entry is used?
Documentation/technical/trivial-merge.txt describes this under
three-way case. Essentially this was an attempt to extend the
original merge-resolve so that it would catch problematic
criss-cross cases (case #16 in the description).
next prev parent reply other threads:[~2007-08-17 2:15 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-15 21:19 1.5.3-rc5 regression on OS X? Perrin Meyer
2007-08-15 21:33 ` Junio C Hamano
2007-08-15 21:43 ` Brian Gernhardt
2007-08-15 22:14 ` Randal L. Schwartz
2007-08-15 22:42 ` Junio C Hamano
2007-08-15 22:46 ` [PATCH] Fix read-tree merging more than 3 trees using 3-way merge Junio C Hamano
2007-08-17 0:59 ` Linus Torvalds
2007-08-17 2:14 ` Junio C Hamano [this message]
2007-08-17 2:32 ` Linus Torvalds
2007-08-17 3:38 ` Junio C Hamano
2007-08-17 3:44 ` Linus Torvalds
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=7vbqd6j4a0.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=perrinmeyer@yahoo.com \
--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 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.