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

Use "git cherry-pick" for implementing copy/paste of commits

Browse Source 
We do this because
- it's closer to what you would do on the command line
- it simplifies the code a bit
- it will allow us to support cherry-picking merge commits.
This commit is contained in:
Stefan Haller
2024-06-18 19:32:27 +02:00
parent 05b3ae9524
commit 4b35434eba
4 changed files with 21 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go
View File

@ -69,7 +69,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
SelectNextItem().
PressPrimaryAction()
t.Common().ContinueOnConflictsResolved("rebase")
t.Common().ContinueOnConflictsResolved("cherry-pick")
t.Views().Files().IsEmpty()