Unmerged conflict in TSX file causes freeze for all later files

Open donmccurdy opened this issue 1 year ago • 1 comments

Version info

OS: macOS 14.4.1 (23E224)
Build: Stable Build 2096

Description

I've been working on incremental rebase of an old Git branch, rebasing my branch on 10-30 commits at a time, in order to limit the conflicts. On one particular 'step' of the rebase, I observed that Sublime Merge began freezing.

Symptoms:

Sidebar shows 12 unmerged files.
For files 1–N, the changes page looks fine.
For files N-12, the changes page hangs indefinitely:

Pressing "Resolve" on any of the 12 files will freeze Sublime Merge indefinitely, resolving conflicts in the UI is not possible. I manually resolved all conflicts in the N^th file, and afterward Sublime Merge was able to work normally with all of the remaining 11 files.

While the N^th file remains unmerged, Sublime Merge cannot be closed without force quitting the application. The file is a 1600-line .tsx file, with nothing obviously weird that I can see.

I tried starting Sublime Merge with smerge --safe-mode, and the freeze occurs regardless. I also tried reproducing the same rebase from a fresh clone of the same (private) repository, with no difference in the result.

Possibly related:

https://github.com/sublimehq/sublime_merge/issues/1095

Steps to reproduce

This is a private repository, and unfortunately I don't think I can share access to the full repository. I probably could share an unmerged copy of that N^th file, privately, if that would be helpful? Please let me know, thanks.

Expected behavior

Ideally Sublime Merge would not freeze because of the contents of a particular unmerged file. :)

Debug Information

I can share this privately, if needed.

Screenshots

Main view:

main