From: Junio C Hamano <gitster@pobox.com>
To: Nanako Shiraishi <nanako3@lavabit.com>
Cc: "Leo Razoumov" <slonik.az@gmail.com>,
"Caleb Cushing" <xenoterracide@gmail.com>,
git@vger.kernel.org
Subject: Re: more merge strategies : feature request
Date: Wed, 03 Dec 2008 18:15:06 -0800 [thread overview]
Message-ID: <7vabbc7kk5.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20081204062717.6117@nanako3.lavabit.com> (Nanako Shiraishi's message of "Thu, 04 Dec 2008 06:27:17 +0900")
Nanako Shiraishi <nanako3@lavabit.com> writes:
> Isn't what Caleb wants "-X ours/theirs" per-hunk option for merge strategy backends?
>
> It was discussed several months ago on the list and was rejected. For details you can start here:
>
> http://thread.gmane.org/gmane.comp.version-control.git/89010/focus=89021
>
> I still think the patch in the above link was reasonable, but the thread
> was distracted into discussing minor syntactical details of how the
> option gets passed to the backend, and the rest of the discussion to
> decide if it makes sense to add such a feature was unfortunately lost in
> the noise and never concluded.
I thought http://article.gmane.org/gmane.comp.version-control.git/89033 in
the thread (and your response to it which is 89175) pretty much concluded
the discussion. Is Caleb adding anything new to the discussion (iow, is
there a convincing new argument why having such a merge is a good idea and
what the workflow looks like that benefits from it)?
next prev parent reply other threads:[~2008-12-04 2:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-29 16:48 more merge strategies : feature request Caleb Cushing
2008-12-01 9:18 ` Andreas Ericsson
2008-12-02 2:38 ` Caleb Cushing
2008-12-02 3:30 ` Jeff King
2008-12-02 14:28 ` Caleb Cushing
2008-12-02 15:30 ` Jeff King
2008-12-02 2:49 ` Leo Razoumov
2008-12-02 13:46 ` Caleb Cushing
2008-12-03 1:07 ` Leo Razoumov
2008-12-03 21:27 ` Nanako Shiraishi
2008-12-03 22:59 ` Caleb Cushing
2008-12-04 2:15 ` Junio C Hamano [this message]
2008-12-04 10:11 ` Nanako Shiraishi
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=7vabbc7kk5.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=nanako3@lavabit.com \
--cc=slonik.az@gmail.com \
--cc=xenoterracide@gmail.com \
/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.