From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Apr 2018 23:23:47 GMT
Subject: Re: [PATCH v1 1/2] merge: Add merge.renames config setting
Message-ID: <xmqqy3hd8q2k.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <1fb11850-4c20-5327-a63a-6d1f5aa18ea4@gmail.com>

Ben Peart <peartben@gmail.com> writes:

>> I also had to wonder how "merge -s resolve" faired, if the project
>> is not interested in renamed paths at all.
>>
>
> To be clear, it isn't that we're not interested in detecting renamed
> files and paths.  We're just opposed to it taking an hour to figure
> that out!

Yeah, but as opposed to passing "oh, let's see if we can get a
reasonable result without rename detection just this time" from the
command line, configuring merge.renames=false in would mean exactly
that: "we don't need rename detection, just want to skip the cycles
spent for it".  That is why I wondered how well the resolve strategy
would have fit your needs.