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

Insert fake todo entry for a conflicting commit that is being applied

Browse Source 
When stopping in a rebase because of a conflict, it is nice to see the commit
that git is trying to apply. Create a fake todo entry labelled "conflict" for
this, and show the "<-- YOU ARE HERE ---" string for that one (in red) instead
of for the real current head.
This commit is contained in:
Stefan Haller
2023-02-26 11:51:02 +01:00
parent d66ca7751c
commit 3928d0ebda
12 changed files with 357 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/integration/tests/sync/pull_rebase_interactive_conflict_drop.go
View File

@@ -48,14 +48,16 @@ var PullRebaseInteractiveConflictDrop = NewIntegrationTest(NewIntegrationTestArg
Focus().
Lines(
Contains("pick").Contains("five").IsSelected(),
Contains("YOU ARE HERE").Contains("three"),
Contains("conflict").Contains("YOU ARE HERE").Contains("four"),
Contains("three"),
Contains("two"),
Contains("one"),
).
Press(keys.Universal.Remove).
Lines(
Contains("drop").Contains("five").IsSelected(),
Contains("YOU ARE HERE").Contains("three"),
Contains("conflict").Contains("YOU ARE HERE").Contains("four"),
Contains("three"),
Contains("two"),
Contains("one"),
)