From: "Raimund Berger" <raimund.berger@gmail.com>
To: git@vger.kernel.org
Subject: Newbie question regarding 3way merge order.
Date: Thu, 29 Jan 2009 23:25:00 +0100 [thread overview]
Message-ID: <871vulda2r.fsf@gigli.quasi.internal> (raw)
Hi guys
I got a dumb question for you to wholeheartedly laugh at, and to which
the answer seems to be so self evident. I'd still like a possibly
authoritative statement though, just for the books.
The question is whether a (3way) merge is commutative, purely in terms
of content (i.e. disregarding commit history for now). Iow if no matter
in which order I merge A and B, i.e. A into B or B into A, I'd be
guaranteed to arrive at the same content.
If yes, a followup question would be if the merge machinery sitting
beneath rebase is exactly the same as that of a standard merge.
The reason I ask is obvious I guess. What basically interests me is if I
gave a bunch of topic branches exposure on a test branch and, after
resolving issues, applied them to stable, that I could be 100% sure to
not introduce new issues content wise just by applying merges in a
different order or form (rebase, patch set).
Thanks for feedback, Raimund.
next reply other threads:[~2009-01-29 22:26 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-29 22:25 Raimund Berger [this message]
2009-01-30 11:37 ` Newbie question regarding 3way merge order Raimund Berger
2009-01-30 17:31 ` Sitaram Chamarty
2009-01-30 19:09 ` Raimund Berger
2009-01-31 0:32 ` Sitaram Chamarty
2009-01-31 13:26 ` Raimund Berger
2009-01-31 21:45 ` Nanako Shiraishi
2009-02-01 14:13 ` Raimund Berger
2009-02-01 19:22 ` Junio C Hamano
2009-02-02 1:50 ` Sitaram Chamarty
2009-02-02 14:58 ` Raimund Berger
2009-02-02 16:10 ` Johannes Sixt
2009-02-02 18:15 ` Raimund Berger
2009-02-03 7:21 ` Johannes Sixt
2009-01-31 0:57 ` Nanako Shiraishi
2009-01-31 13:14 ` Raimund Berger
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=871vulda2r.fsf@gigli.quasi.internal \
--to=raimund.berger@gmail.com \
--cc=git@vger.kernel.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.