From: Bert Wesarg <bert.wesarg@googlemail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: [PATCH 2/3] make union merge an xdl merge favor
Date: Mon, 1 Mar 2010 07:57:40 +0100 [thread overview]
Message-ID: <36ca99e91002282257i7f07f035o15d8d64e062ee94e@mail.gmail.com> (raw)
In-Reply-To: <7vwrxx2k29.fsf@alter.siamese.dyndns.org>
On Sun, Feb 28, 2010 at 21:15, Junio C Hamano <gitster@pobox.com> wrote:
> Bert Wesarg <bert.wesarg@googlemail.com> writes:
>
>> The current union merge driver is implemented as an post process. But the
>> xdl_merge code is quite capable to produce the result by itself. Therefore
>> move to it there and teach git-merge-file a new --union option.
>
> I like the idea of patch 2 and 3 but they are independent of what we do
> (or don't do) to merge-file. Could you flip the order of the patches so
> that 2 and 3 can go first?
WIll do. On a side note: I plan to support the --union option also for
git-checkout. Would that be a good idea?
Bert
>
>
>
next prev parent reply other threads:[~2010-03-01 6:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-28 19:56 [PATCH 1/3] merge-file: add option to specify the marker size Bert Wesarg
2010-02-28 19:56 ` [PATCH 2/3] make union merge an xdl merge favor Bert Wesarg
2010-02-28 20:15 ` Junio C Hamano
2010-03-01 6:57 ` Bert Wesarg [this message]
2010-03-01 9:01 ` Junio C Hamano
2010-03-01 10:55 ` Bert Wesarg
2010-03-01 17:28 ` Junio C Hamano
2010-02-28 19:56 ` [PATCH 3/3] refactor merge flags into xmparam_t Bert Wesarg
2010-02-28 20:13 ` [PATCH 1/3] merge-file: add option to specify the marker size Junio C Hamano
[not found] ` <36ca99e91002282315m6c3caf1el61755c0d96d21cf2@mail.gmail.com>
2010-03-01 9:18 ` Bert Wesarg
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=36ca99e91002282257i7f07f035o15d8d64e062ee94e@mail.gmail.com \
--to=bert.wesarg@googlemail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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).