Build 2093 crashed on resolving merge conflicts

[eblot]

Version info

• OS: macOS Sonoma 14.4.1 (23E224) M1 Pro
• Build: 2093

Description

Since the upgrade this morning (from 2092), SM crashes when the "Resolve" button on a git merge conflict is clicked. Never experienced this issue with the previous version.

Steps to reproduce

Steps to reproduce the behavior:

• Cherry pick on commit from another branch, which create a basic conflict on the first lines of a Python file
• Click on Resolve
• SM crashed

Expected behavior

No crash :-)

Debug Information

=== App Version Information ===
Build: 2093

=== Git Version Information ===
Using Git: git (system)
git version 2.44.0
PATH: /usr/local/bin:/opt/homebrew/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/opt/X11/bin:/Library/Apple/usr/bin:/Library/TeX/texbin:/Users/eblot/.cargo/bin (from shell)
environment variables loaded using: /opt/homebrew/bin/zsh -l

=== Browse Page Information ===
HEAD: a427837a79251ebad588e5d94e1780d13778fd77
Is in merge: 0
Is in cherry_pick: 0
Is in rebase: 1
Is in revert: 0

=== Git Status Information ===
UU scripts/opentitan/ot/util/misc.py

=== Our Status Information ===
U U scripts/opentitan/ot/util/misc.py

=== Git Attributes Information ===
git check_attr --all output

=== Our Modified Files Newline Normalisation and EOL Information ===

=== Our Modified Files Flag Information ===
Ignoring symlinks: 0

2024-04-10 19:13:09.617097 (gui/501/application.com.sublimemerge.103175444.103175570 [51878]) <Notice>: exited due to SIGSEGV | sent by exc handler[51878]
2024-04-10 19:13:09.617101 (gui/501/application.com.sublimemerge.103175444.103175570 [51878]) <Notice>: service has crashed 1 times in a row (last was not dirty)
2024-04-10 19:13:09.617106 (gui/501/application.com.sublimemerge.103175444.103175570 [51878]) <Notice>: service state: exited
2024-04-10 19:13:09.617123 (gui/501/application.com.sublimemerge.103175444.103175570 [51878]) <Notice>: internal event: EXITED, code = 0
2024-04-10 19:13:09.617127 (gui/501/application.com.sublimemerge.103175444.103175570 [51878]) <Notice>: job state = exited
2024-04-10 19:13:09.617160 (gui/501 [100017]) <Notice>: service inactive: application.com.sublimemerge.103175444.103175570
2024-04-10 19:13:09.617164 (gui/501/application.com.sublimemerge.103175444.103175570 [51878]) <Notice>: service state: not running
2024-04-10 19:13:09.617171 (system) <Notice>: removing child: pid/51878
2024-04-10 19:13:09.624832 (gui/501/application.com.sublimemerge.103175444.103175570) <Notice>: removing job: caller = runningboardd
2024-04-10 19:13:09.624846 (gui/501 [100017]) <Notice>: removing service: application.com.sublimemerge.103175444.103175570
2024-04-10 19:13:09.624855 (gui/501/application.com.sublimemerge.103175444.103175570) <Notice>: internal event: PETRIFIED, code = 0
2024-04-10 19:13:09.624858 (gui/501/application.com.sublimemerge.103175444.103175570) <Notice>: job state = removed

[eblot]

Just downloaded previous build from https://download.sublimetext.com/sublime_merge_build_2092_mac.zip, overwritten the app in /Applications with this previous build, and re-opened SublimeMerge. The conflict kept appearing - as expected - and clicking on resolve makes the 3-way merge window to appear - as expected.

The only diff between those runs are the Sublime Merge build (2093 vs. 2092). At least there is an easy way back :)

[themilkman]

Should be fixed in 2094, can you confirm?

[eblot]

Yes, it has not crashed anymore on a couple of merges I did since upgrading to 2094 end of last week. Thanks!