Re: [PATCH] RFC: switch: allow same-commit switch during merge if conflicts resolved

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: May 7, 2023, 22:01 UTC
Message-ID: <64581fc358ede_4e6129442@chronos.notmuch>
In-Reply-To: <CABPp-BGmPKyNcDa-wUh-oisTvvux+X=6BvGxSNQC2O7uodpFrA@mail.gmail.com>

Elijah Newren wrote:

> On Wed, May 3, 2023 at 10:01 PM Tao Klerks <tao@klerks.biz> wrote:

Show 5 quoted lines

> > If we are comfortable changing the behavior of branch checkout to be
> > safe-and-limiting like switch, then that should be almost as simple as
> > removing that condition.
> 
> I've never heard a dissenting vote against this

Here is my dissenting vote: I'm against this change.

If I want to use a high-level command meant for novices, I use `git switch`. If instead I simply want to switch to a different commit and I want git to shut up about it, then I use `git checkout`.

You want to strip away the options for experts, in search for what?

If there was a way of doing:

  git -c core.iknowwhatimdoing=true checkout $whatever

Then I wouldn't oppose such change.

But this is not the proposal. The proposal is to break backwards compatibility for expert users with no way to retain the existing behavior.

Generally, breaking backwards compatibility for no reason is frowned upon.

-- 
Felipe Contreras