sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

Mention which command is continued in PromptToContinueRebase

Browse Source 
When you are in the middle of a rebase, and you cherry-pick a commit which
conflicts, it helps to be clear on whether you are prompted to continue the
cherry-pick or the rebase.
This commit is contained in:
Stefan Haller
2024-06-12 14:45:45 +02:00
parent 542525743c
commit 362678e2ef
23 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,7 @@
package components
import "fmt"
// for running common actions
type Common struct {
t *TestDriver
@ -43,10 +45,10 @@ func (self *Common) AcknowledgeConflicts() {
Confirm()
}
func (self *Common) ContinueOnConflictsResolved() {
func (self *Common) ContinueOnConflictsResolved(command string) {
self.t.ExpectPopup().Confirmation().
Title(Equals("Continue")).
Content(Contains("All merge conflicts resolved. Continue?")).
Content(Contains(fmt.Sprintf("All merge conflicts resolved. Continue the %s?", command))).
Confirm()
}