Re: Current state / standard advice for rebasing merges without information loss/re-entry?

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 18, 2022, 15:48 UTC
Message-ID: <xmqqczhe1jgp.fsf@gitster.g>
In-Reply-To: <f87a549f-540e-d0f3-470c-178c2fa141a5@iee.email>

Philip Oakley <philipoakley@iee.email> writes:

> The rerere man page is still magic for me. The UX here could be
> improved. (also, could the rerere-train be focussed on each merge?)

I am curious to see a clarification on the question in parentheses.

Show 6 quoted lines

>> These kinds of discussions frequently seem to feature git experts
>> saying "I have a script for my version of this problem" (Elijah,
>> Junio, Johannes Schindelin, ...), or even "I have a VCS for this
>> problem" :), but I seem to be too stupid or impatient to dig
>> through/understand whether or when these things will work for a
>> regular joe and how to use them.

You shouldn't take that to mean "there already is a script to satisfy _my_ needs and no improvement is needed"; read it as "we have real need that cannot wait for improvements in this area, so (unfortunately) we have built our workflow around some scripts". We can use these scripts to learn the workflows that are not yet directly supported with existing tools like rebase, but other than that, their presence is not a sign that discourage you to improve the standard tools---it is quite an opposite.