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

Ask to auto-stage unstaged files when continuing a rebase after resolving conflicts

Browse Source
This commit is contained in:
Stefan Haller
2024-08-31 17:39:56 +02:00
parent 3cffed9412
commit ba21d4e651
5 changed files with 118 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/integration/tests/file/discard_all_dir_changes.go
View File

@ -94,6 +94,15 @@ var DiscardAllDirChanges = NewIntegrationTest(NewIntegrationTestArgs{
}).
Tap(func() {
t.Common().ContinueOnConflictsResolved()
t.ExpectPopup().Confirmation().
Title(Equals("Continue")).
Content(Contains("Files have been modified since conflicts were resolved. Auto-stage them and continue?")).
Cancel()
t.GlobalPress(keys.Universal.CreateRebaseOptionsMenu)
t.ExpectPopup().Menu().
Title(Equals("Merge options")).
Select(Contains("continue")).
Confirm()
}).
Lines(
Contains("dir").IsSelected(),