LFS Merge Don't Display Merge Option

[Victor-IX]

During the resolution stage of a merge conflict, sometimes LFS files are marked as Resolved but are actually not resolved (Image 01). When opening the file in a code editor, both LFS pointers can be seen (Image 02). However, Fork cannot display both versions of the file, preventing the user from choosing the desired version.

Resolving the merge conflict using the CLI or Rider's visual interface works correctly.

We observed that the file with the issue only has one size in the merge file, whereas a working LFS file shows two different sizes. We're unsure if this is related to issue #1928 or not.

This bug is problematic as users can push the merge conflict file, overwriting the binary content of the LFS file.

[DanPristupov]

When opening the file in a code editor

Can you send me the conflict file content (the one on the screenshot) to [email protected], please?