Bug: Files crashes when switching git branch during a merge conflict

[el-ev]

Description

As described above.

Steps To Reproduce

1. First, create a Git repository in a merge conflict state:

mkdir test
cd test
git init
echo "master" > test.txt
git add test.txt
git commit -m "master"
git branch b1
git branch b2
git checkout b1
echo "b1" > test.txt
git add test.txt
git commit -m "b1"
git checkout b2
echo "b2" > test.txt
git add test.txt
git commit -m "b2"
git checkout b1
git merge b2

2. In Files, navigate to the test directory, click the Git integration tool, and switch to b2 branch by either “Bring my changes to 'b2'" or "Leave my changes on 'b1".
3. Files will crash immediately.

Files Version

3.9.1.0

Windows Version

10.0.26100.3323

User ID

adae468e-679d-43ff-829c-81eff14cf62b

Log File

debug.log

[yaira2]

Thank you for reporting this issue

[Lamparter]

I can try to fix this