Skip to content

"Continue rebase" confirmation popup not dismissed when rebase is completed externally #5197

@aofei

Description

@aofei

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

  1. Start a rebase that results in conflicts
  2. Resolve the conflicts manually in an external editor
  3. Run git add <file> and git rebase --continue in a separate terminal
  4. Lazygit detects conflicts are resolved and shows the Continue popup
  5. 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

Image

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

No one assigned

    Labels

    bugSomething isn't working

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions