Re: The git spring cleanup challenge

From: Johannes Sixt <j6t@kdbg.org>
Date: Jun 2, 2021, 06:47 UTC
Message-ID: <9fb1f823-44f8-8046-adb5-d2c0fdb6b5a0@kdbg.org>
In-Reply-To: <60b6c642ba65b_4044208ca@natae.notmuch>

Am 02.06.21 um 01:44 schrieb Felipe Contreras:

Show 7 quoted lines

> Junio C Hamano wrote:
>> Junio C Hamano <gitster@pobox.com> writes:
>>> David Aguilar <davvid@gmail.com> writes:
> 
>>>> +1 for merge.conflictstyle = diff3, rerere.enabled = true, and
>>>> log.decorate = short from me. I noticed others already mentioned
>>>> these.

Does diff3 conflict style reduce conflicts to their minimum? I don't think so. Therefore, a strong -1 for this as the default.

Show 12 quoted lines

>>> As the inventor of rerere, I agree on rerere.enabled.  It was made
>>> opt-in only because I thought it was somewhat risky when the feature
>>> was introduced, but it has been stable and useful, and it is long
>>> overdue to be enabled by default.
>>
>> Just to make sure, rerere.enabled is fine, but as I am not
>> comfortable to recommend rerere.autoupdate to any human users, I
>> would be opposed to turning it on by default.  Giving people a
>> choice is fine, but the default should be a safe one that offers
>> users a chance of final sanity checking before proceeding.
> 
> No commit is made. Doesn't `git diff --staged` offer users such chance?

rerere.autoupdate erases the information which files had conflicts. In my workflow, the rerere database time and again does hold outdated merge resolutions. I want to have an opportunity to cross-check the automatic resolutions, and for that I need to know which files had conflicts.

I'm using a toolset on top of Git and am not paying attention to the terminal---if and when I'm using it at all---that would list the conflicted files. So, I'm strongly opposed to enabling it by default.

BTW, a +1 for rerere.enabled=true from me.

-- Hannes