sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-31 14:24:25 +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

2
pkg/integration/tests/sync/pull_rebase_interactive_conflict.go
View File

@ -74,7 +74,7 @@ var PullRebaseInteractiveConflict = NewIntegrationTest(NewIntegrationTestArgs{
SelectNextItem().
PressPrimaryAction() // choose 'content4'
t.Common().ContinueOnConflictsResolved()
t.Common().ContinueOnConflictsResolved("rebase")
t.Views().Status().Content(Equals("↑2 repo → master"))