Re: [PATCH 0/1] Be nicer to the user on tracked/untracked merge conflicts

From: Jonathan Bressat <git.jonathan.bressat@gmail.com>
Date: Apr 14, 2022, 08:57 UTC
Message-ID: <CANteD_zkvDiMBT2M3_eL_HV5v=ckg=fJQxEGrvDx5ttMAdSdUg@mail.gmail.com>
In-Reply-To: <220412.868rsagkus.gmgdl@evledraar.gmail.com>

On Tue, Apr 12 2022, Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:

> Do you have an example of such a non-working case? I'm not sure why it
> wouldn't work.

For exemple this test fail:

+test_expect_success 'overwrite the file when fastforward and the same
content' '
+ echo content >README.md &&
+ test_commit "init" README.md &&
+ git branch A &&
+ git checkout -b B &&
+ echo content >file &&
+ test_commit "tracked" file &&
+ git checkout A &&
+ echo content >file &&
+ git merge B
+'

but this one works:

+test_expect_success 'overwrite the file when fastforward and the same
content' '
+ echo content >README.md &&
+ test_commit "init" README.md &&
+ git branch A &&
+ git checkout -b B &&
+ echo content >file &&
+ git add file &&
+ test_commit "tracked" &&
+ git checkout A &&
+ echo content >file &&
+ git merge B
+'

will send you a new version of our patch soon. Thanks to your reviews and help.

Jonathan BRESSAT and Guillaume COGONI