mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 15:46:26 -04:00
90d8ef499c
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> |
||
|---|---|---|
| .. | ||
| continue_prompt_dismissed_when_resolved_externally.go | ||
| filter.go | ||
| merge_file_both.go | ||
| merge_file_current.go | ||
| merge_file_incoming.go | ||
| pick_both_hunks_diff3.go | ||
| resolve_externally.go | ||
| resolve_externally_started_merge_no_prompt.go | ||
| resolve_multiple_files.go | ||
| resolve_no_auto_stage.go | ||
| resolve_non_textual_conflicts.go | ||
| resolve_without_trailing_lf.go | ||
| space_on_non_textual_conflict.go | ||
| undo_choose_hunk.go | ||