Re: [PATCH v4] merge: new autosetupmerge option 'simple' for matching branches

From: Tao Klerks <tao@klerks.biz>
Date: Apr 29, 2022, 07:31 UTC
Message-ID: <CAPMMpoiD8KFMg2vwNNRN9ZM5tpkCTPswcknLtDsDJZ3YepnD7Q@mail.gmail.com>
In-Reply-To: <CAPMMpohn6+RQV=jg9fQc4nt1tK6zE38xAwejxNfGh+-4Dp_JNw@mail.gmail.com>

On Sun, Apr 24, 2022 at 1:57 PM Tao Klerks <tao@klerks.biz> wrote:

Show 9 quoted lines

>
>
> I will have another go at proposing a complete, easy-to-understand,
> easy-to-enter, "simple" workflow that emphasises local and remote
> branch "correspondence" by encouraging "branch.XXX.merge" to always
> and automatically be set to the same-name branch on the remote (and
> not any other "parent" you might have branched from when creating a
> topic branch), and a reasonable non-intrusive, non-misleading way to
> on-ramp into it.

I now have a complete proposal that I think is coherent, clear, improves the user experience as desired, and does not interfere with any of the existing functionality/workflows. There are a couple niggles around naming that I'd like feedback on. I expect to submit this new proposal today.

(nb: it's become a patch series again)