From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Mon, 01 Mar 2010 10:55:36 GMT
Subject: Re: [PATCH 2/3] make union merge an xdl merge favor
Message-ID: <36ca99e91003010255h5784f29dq81737a736639cac8@mail.gmail.com>
In-Reply-To: <7vaausza8v.fsf@alter.siamese.dyndns.org>

On Mon, Mar 1, 2010 at 10:01, Junio C Hamano <gitster@pobox.com> wrote:
> Bert Wesarg <bert.wesarg@googlemail.com> writes:
>
>> WIll do. On a side note: I plan to support the --union option also for
>> git-checkout. Would that be a good idea?
>
> What does it do?  Resolve conflicted paths using union merge at checkout
> time?  That somehow feels like a dirty "because we can, and I only care
> about union" hack to me.

Point taken, I does not have a usecase by myself.