go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-25 22:32:13 +02:00
Code Issues Releases Activity

Show menu instead of prompt when there are conflicts in a rebase or merge

Browse Source 
This solves the issue that previously you could too easily abort a rebase
accidentally by hitting escape.
This commit is contained in:
Stefan Haller
2023-05-31 18:29:01 +02:00
parent c70c8e84f8
commit 16dceb813b
11 changed files with 131 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/integration/components/common.go
View File

@@ -19,9 +19,9 @@ func (self *Common) ContinueRebase() {
}
func (self *Common) AcknowledgeConflicts() {
self.t.ExpectPopup().Confirmation().
Title(Equals("Auto-merge failed")).
Content(Contains("Conflicts!")).
self.t.ExpectPopup().Menu().
Title(Equals("Conflicts!")).
Select(Contains("View conflicts")).
Confirm()
}