Merge conflict: Unable to tick checkbox

[simonschaller]

When I apply a stash that leads to a merge conflict, I'm no longer able to tick the checkbox of the version I want to keep.
See screen recording.

I use version 2.68.0 on macOS

CleanShot.2026-07-02.at.14.36.02.mp4

[DanPristupov]

I suppose file was edited in stash and deleted in main. Git can't merge it.