From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 05 Mar 2013 18:47:11 GMT
Subject: Re: auto merge bug
Message-ID: <7va9qhu1jk.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20130305175904.GC9379@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> I'm also not sure how useful those really are in practice. I have not
> used "union" myself ever. And in the example that started this thread, I
> find the use of "union" slightly dubious.

Yeah, I do not think anybody sane used "union" outside toy examples.
IIRC, it was originally done as a "if you want a GIGO, here it is,
go hang yourself." response to "I am too lazy to resolve conflicts
myself, Git should let me take both sides blindly."