mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-10 07:36:27 -04:00
ad507d67f4
When conflicts of an in-progress rebase/merge/cherry-pick/revert are resolved, lazygit pops up a prompt offering to continue it. This is helpful when you started the operation in lazygit and resolved the conflicts in your editor. But it's confusing when the operation was started outside lazygit — e.g. by a coding agent in another terminal that resolves the conflicts but hasn't continued yet because it's still running tests or fixing the build. lazygit would then prompt unbidden. Track whether the in-progress operation was started from within lazygit, and only show the prompt in that case. We record this right after running a merge/rebase step (in CheckMergeOrRebaseWithRefreshOptions, the subprocess branch of genericMergeCommand, and the custom-command conflict path), and clear it whenever a refresh observes that no operation is in progress — which also handles an operation that was finished or aborted externally. The conflict-resolution tests start their operation by running git directly (not through lazygit's UI), so they call the new test helper Common.PretendMergeOrRebaseStartedInLazygit to have lazygit treat the operation as its own and still get the prompt. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| 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 | ||