From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 01 Mar 2010 09:01:20 GMT
Subject: Re: [PATCH 2/3] make union merge an xdl merge favor
Message-ID: <7vaausza8v.fsf@alter.siamese.dyndns.org>
In-Reply-To: <36ca99e91002282257i7f07f035o15d8d64e062ee94e@mail.gmail.com>

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.

I am mildly against "merge-file --union" in the first place.  The part I
actually liked in [2/3] was the removal of postprocessing.