From: Junio C Hamano <gitster@pobox.com>
To: "D. Ben Knoble" <ben.knoble@gmail.com>
Cc: Johannes Sixt <j6t@kdbg.org>,
Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>,
git@vger.kernel.org
Subject: Re: [rfc] flip rerere.enabled default to be "on" at Git 3.0 boundary?
Date: Thu, 23 Oct 2025 12:44:07 -0700 [thread overview]
Message-ID: <xmqqtszptnco.fsf@gitster.g> (raw)
In-Reply-To: <CALnO6CB3EZkAyc_fWdU+P_MLcipZ4T90RSk0+46Fc20OmWEpmQ@mail.gmail.com> (D. Ben Knoble's message of "Thu, 23 Oct 2025 15:19:57 -0400")
"D. Ben Knoble" <ben.knoble@gmail.com> writes:
> Was this intended as "another todo list item to work on"? If so, I'm
> afraid I'm having trouble decoding what the issue that needs fixed is.
> My nth re-read suggests that the sharp edge here is "delete/modify
> conflicts often need re-resolution favoring delete" and that doing so
> is not easy today?
It meant to add to the list another sharp-edge, which is that
'rerere' does not even attempt to help you deal with delete-modify
conflicts at all. Either it needs to be communicated better that
the users are on their own with delete-modify conflicts, or a good
support needs to be designed and documented.
next prev parent reply other threads:[~2025-10-23 19:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-21 18:21 [rfc] flip rerere.enabled default to be "on" at Git 3.0 boundary? Junio C Hamano
2025-10-21 18:55 ` Kristoffer Haugsbakk
2025-10-21 21:36 ` D. Ben Knoble
2025-10-21 21:37 ` D. Ben Knoble
2025-10-21 22:19 ` Junio C Hamano
2025-10-22 5:55 ` Johannes Sixt
2025-10-22 17:45 ` Ben Knoble
2025-10-22 18:54 ` Junio C Hamano
2025-10-23 19:19 ` D. Ben Knoble
2025-10-23 19:44 ` Junio C Hamano [this message]
2025-10-23 22:03 ` Ben Knoble
2025-10-21 19:45 ` Taylor Blau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtszptnco.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=ben.knoble@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=kristofferhaugsbakk@fastmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).