Originally posted by @daulis in #4078

@eamodio Thank you! This already seems much better, and I can't reproduce the specific issue anymore (it was easily reproducible before for me). I tested with version = 2025.3.1305. This solved the main issue of the lockup, which could previously only be corrected by a Reload Window

I still see one odd case related to this workflow, but the symptoms are slightly different:

• git rebase -i origin/main
• GitLens commit view shows: "Pending rebase of MY_BRANCH onto main" (as expected)
• Commandline shows: "hint: Waiting for your editor to close the file..." (as expected)
• .git/rebase-merge/git-rebase-todo is opened in the GUI
  • Sometimes this opens the "GitLens Interactive Rebase" GUI, with the commit list (as expected)
  • But sometimes no file contents are displayed at all - The contents of the file tab are blank, and the "GitLens Interactive Rebase" part of the tab never displays. It just sits there waiting. (not expected)
  • When this occurs, the actual file contents of .git/rebase-merge/git-rebase-todo are correct. But, nothing will display in the GUI.

The only way to recover is:

• Close the git-rebase-todo editor window
• git rebase --abort
• Try to rebase again: git rebase -i origin/main