Re: Possible merge bug

[Saksham Mittal <saksham.mittal000@gmail.com>]

Hello there,

I wrote a small script as well that automates testing this use case as well, but I don't really know what the policy is on attachments in git, seeing as how it's my first time contributing to git.

I am on git version 2.33.1 on Fedora 35, but I am not seeing the bug while running the script. So, I grabbed the git source code and built it. This version is 2.34.0.rc2.9.g4d53e91c6b, not quite your version but I tried to go back to the commit you mentioned and build it, but I faced some errors and no binary would build.

Anyway, the version I built and tested also did not permit auto merge and required me to manually make changes as well, so the issue seems to have been fixed.

You can take a look at my script as well, I followed your instructions as best I could and built this:

#!/bin/bash

git --version

mkdir sample
cd sample
git init
echo -e "a\nb\nc\n" > test
git add .
git commit -m "abc"

git branch b1
git switch b1

echo -e "b\na\nc" > test
git add .
git commit -m "bac"

git switch main
git branch b2
git switch b2

echo -e "b\nc\na" > test
git add .
git commit -m "bca"

git switch main
git merge b1
git merge b2

git log --graph --oneline --all


Cheers,

Saksham Mittal