Re: auto merge bug

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: auto merge bug

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:56:18

Jeff King [off-list ref] 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."

Re: auto merge bug

From: Andreas Ericsson <hidden>
Date: 2016-06-15 22:56:18

On 03/05/2013 07:47 PM, Junio C Hamano wrote:
Jeff King [off-list ref] writes:
quoted
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.
I do, for lists used in tests or to generate perfect hashes from. It's
really quite handy for things like that but totally useless for any
type of multiline format, or even .ini style files unless you're very,
very careful with how you write them.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231

Considering the successes of the wars on alcohol, poverty, drugs and
terror, I think we should give some serious thought to declaring war
on peace.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help