Testing #5495 with this scenario - merging polish-merge-status into branch-list-context-menu

$ git rev-parse polish-merge-status
361f587830413e05b7299d9f9932cff36aee0127
$ git rev-parse branch-list-context-menu
cbdb0f78739d21193d42eb0f87aa0cded6e505b9

If you don't have these branches, just git checkout [sha] -b [branch-name] to create them locally.

I checkout polish-merge-status and compare it to branch-list-context-menu and I see that we'll have some conflicts.

5 conflicts? Sure, that's not too scary. I continue on and I review the conflicts:

6 conflicts. Wait, what?

The clue I have so far is related to the diff for app/src/ui/branches/branch-list-item.tsx which has conflict markers that contain the ref as well as the file path it came from:

The other files in this list don't have this path - they just have the ref:

This suggests that git merge-tree isn't a full replacement for git merge, but I need to dig deeper into this and see what our options are.