go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-06 22:33:07 +02:00
Code Issues Releases 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

2
pkg/integration/tests/patch_building/move_to_earlier_commit_from_added_file.go
View File

@ -71,7 +71,7 @@ var MoveToEarlierCommitFromAddedFile = NewIntegrationTest(NewIntegrationTestArgs
SelectNextItem().
PressPrimaryAction() // choose the version with all three lines
t.Common().ContinueOnConflictsResolved()
t.Common().ContinueOnConflictsResolved("rebase")
t.Views().Commits().
Focus().

2
pkg/integration/tests/patch_building/move_to_index_from_added_file_with_conflict.go
View File

@ -67,7 +67,7 @@ var MoveToIndexFromAddedFileWithConflict = NewIntegrationTest(NewIntegrationTest
SelectNextItem().
PressPrimaryAction()
t.Common().ContinueOnConflictsResolved()
t.Common().ContinueOnConflictsResolved("rebase")
t.ExpectPopup().Alert().
Title(Equals("Error")).

2
pkg/integration/tests/patch_building/move_to_index_with_conflict.go
View File

@ -62,7 +62,7 @@ var MoveToIndexWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
).
PressPrimaryAction()
t.Common().ContinueOnConflictsResolved()
t.Common().ContinueOnConflictsResolved("rebase")
t.ExpectPopup().Alert().
Title(Equals("Error")).