lazygit

starred/lazygit

Fork 0

mirror of https://github.com/jesseduffield/lazygit.git synced 2026-08-29 02:34:16 -05:00

Files

T

History

Stefan HallerandClaude Opus 4.8 90d8ef499c Auto-dismiss the continue-rebase prompt when it becomes stale

The prompt offering to continue a rebase/merge is opened from a refresh
and then left to sit until the user acts on it. But the operation can
change out from under it: a coding agent (or the user in another
terminal) might continue or abort it, or advance it to a commit with new
conflicts. The prompt then becomes stale — pressing continue fails with
"no rebase in progress" or acts on the wrong state.

Track whether the prompt is showing, and on each refresh dismiss it if
the operation is no longer in the "resolved, ready to continue" state
that the prompt is offering to act on. This runs on the same refreshes
that would open it (including the background poll and the refresh on
window focus), so the prompt disappears on its own shortly after the
operation moves on.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

2026-07-03 18:30:02 +02:00

continue_prompt_dismissed_when_resolved_externally.go

Auto-dismiss the continue-rebase prompt when it becomes stale

2026-07-03 18:30:02 +02:00

filter.go

Add a root item ("/") if files at top level have changed

2025-03-21 08:04:58 +01:00

merge_file_both.go

Only prompt to continue a rebase/merge if we started it

2026-07-03 18:28:07 +02:00

merge_file_current.go

Only prompt to continue a rebase/merge if we started it