Re: [RFC/PATCH] mergetool: use resolved conflicts in all the views

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Dec 19, 2020, 12:08 UTC
Message-ID: <5fdded2523e7e_1de0de208e1@natae.notmuch>
In-Reply-To: <xmqq1rfmqc8g.fsf@gitster.c.googlers.com>

Junio C Hamano wrote:

Show 21 quoted lines

> Seth House <seth@eseth.com> writes:
> 
> > I think where we're not seeing eye-to-eye is that you're focusing on
> > potential "negative" consequences whereas I'm talking about having more
> > information about the merge rather than less.
> >
> > There is very likely no negative consequences for most, if not all,
> > mergetools. I wrote the initial version of diffconflicts ten years ago
> > and I've been using it nearly every day since. I'm fairly confident in
> > the end result. What is a fact is there is undisputedly less information
> > about the merge if we overwrite LOCAL and REMOTE; as I've written,
> > I think the tradeoff is worthwhile for most tools but a per-tool
> > configuration will allow people that feel differently to choose
> > differently.
> 
> Thanks for stressing this point.
> 
> When a user or developer asks for a reasonable feature (e.g.
> configurability to suit personal taste), especially when there is no
> obvious downside for adding it, the burden of proof is on the party
> who refuses to add it

Sorry, but no.

You may be the final word in the git project, but the burden of proof is an essential part of logic, not project-dependent, and that's just not the case.

*Anyone* that makes any claim has the burden of proof.

That is enshrined in the latin maxim:

  Semper necessitas probandi incumbit ei qui agit.

  The necessity of proof always lies with the person who lays charges.

There is a reason why in the US justice system defendants are declared "not guilty", and not "inocent".

I have written extensively about the subject, for example: First principles of logic [1].

If a woman is not wearing a wedding ring, the person that claims she is married has the burden of proof, but also the person that claims she is single. *Both* have the burden of proof. It's only the person that says "we don't know" that doesn't.

Is the feature reasonable? If I claim that it's not reasonable, I have he burden of proof, but if you claim that it is reasonable, so do you.

That's just a fact of logic.

> ---they are the ones who have to adequately explain why adding it is
> actively harmful, not just the proposed addition is not necessary
> [*1*].

No. Both have the burden of proof.

Only the people in the default position (we don't know if the feature is reasonable or not) don't require burden of proof.

> There is no need for any "evidence" of "negative consequence" at all
> to ask for a way to selectively enable or disable a new feature.

Yes there is. Not to ask for a feature, but *demand* a feature.

But such burden has been met, which is why users can turn off mergetool.autoMerge, so they can already selectively disable the new feature.

> A new feature tends to trigger unexpected bugs in unseen corner cases
> more than an older feature, even without any concrete numbers, and
> that is good enough reason to insist an escape hatch that is easy to
> access by users to exist.

That rationale is meeting its burden of proof.

But users do already have an escape hatch: "mergetool.automerge=false".

On the other hand the burden of proof for the claim that some tools might want to disable this flag and not other tools has not been met.

Moreover, ignoring arguments doesn't magically make the burden of proof from your side dissappear.

Is there a conflict in this example?

  echo Hello > BASE
  echo Hello > LOCAL
  echo Hello. > REMOTE
  git merge-file -p LOCAL BASE REMOTE

Cheers.

[1] https://felipec.substack.com/p/first-principles-of-logic

-- 
Felipe Contreras