-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Open
Labels
bugSomething isn't workingSomething isn't working
Description
Describe the bug
When a rebase has conflicts and the user resolves them and runs git rebase --continue in an external terminal, the All merge conflicts resolved. Continue the rebase? confirmation popup remains visible even though the rebase has already completed. The Files panel correctly refreshes and shows no conflicting files, but the popup stays on screen.
To Reproduce
- Start a rebase that results in conflicts
- Resolve the conflicts manually in an external editor
- Run
git add <file>andgit rebase --continuein a separate terminal - Lazygit detects conflicts are resolved and shows the
Continuepopup - The popup remains visible even though the rebase has already completed
Expected behavior
The confirmation popup should be automatically dismissed when the rebase/merge is no longer in progress.
Screenshots
Version info:
commit=, build date=, build source=Homebrew, version=0.58.0, os=darwin, arch=arm64, git version=2.52.0
Terminal info:
N/A
Additional context
N/A
Metadata
Metadata
Assignees
Labels
bugSomething isn't workingSomething isn't working