1 files changed, 126 insertions, 0 deletions
diff --git a/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go
new file mode 100644
index 000000000..e177dd0cb
--- /dev/null
+++ b/pkg/integration/tests/interactive_rebase/swap_in_rebase_with_conflict.go
@@ -0,0 +1,126 @@
+package interactive_rebase
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var SwapInRebaseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Via an edit-triggered rebase, swap two commits, causing a conflict. Then resolve the conflict and continue",
+	ExtraCmdArgs: "",
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.CreateFileAndAdd("myfile", "one")
+		shell.Commit("commit one")
+		shell.UpdateFileAndAdd("myfile", "two")
+		shell.Commit("commit two")
+		shell.UpdateFileAndAdd("myfile", "three")
+		shell.Commit("commit three")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Commits().
+			Focus().
+			Lines(
+				Contains("commit three").IsSelected(),
+				Contains("commit two"),
+				Contains("commit one"),
+			).
+			NavigateToListItem(Contains("commit one")).
+			Press(keys.Universal.Edit).
+			Lines(
+				Contains("commit three"),
+				Contains("commit two"),
+				Contains("YOU ARE HERE").Contains("commit one").IsSelected(),
+			).
+			SelectPreviousItem().
+			Press(keys.Commits.MoveUpCommit).
+			Lines(
+				Contains("commit two").IsSelected(),
+				Contains("commit three"),
+				Contains("YOU ARE HERE").Contains("commit one"),
+			).
+			Tap(func() {
+				t.Actions().ContinueRebase()
+			})
+
+		handleConflictsFromSwap(t)
+	},
+})
+
+func handleConflictsFromSwap(t *TestDriver) {
+	continueMerge := func() {
+		t.ExpectPopup().Confirmation().
+			Title(Equals("continue")).
+			Content(Contains("all merge conflicts resolved. Continue?")).
+			Confirm()
+	}
+
+	acceptConflicts := func() {
+		t.ExpectPopup().Confirmation().
+			Title(Equals("Auto-merge failed")).
+			Content(Contains("Conflicts!")).
+			Confirm()
+	}
+
+	acceptConflicts()
+
+	t.Views().Files().
+		IsFocused().
+		Lines(
+			Contains("UU myfile"),
+		).
+		PressEnter()
+
+	t.Views().MergeConflicts().
+		IsFocused().
+		TopLines(
+			Contains("<<<<<<< HEAD"),
+			Contains("one"),
+			Contains("======="),
+			Contains("three"),
+			Contains(">>>>>>>"),
+		).
+		SelectNextItem().
+		PressPrimaryAction() // pick "three"
+
+	continueMerge()
+
+	acceptConflicts()
+
+	t.Views().Files().
+		IsFocused().
+		Lines(
+			Contains("UU myfile"),
+		).
+		PressEnter()
+
+	t.Views().MergeConflicts().
+		IsFocused().
+		TopLines(
+			Contains("<<<<<<< HEAD"),
+			Contains("three"),
+			Contains("======="),
+			Contains("two"),
+			Contains(">>>>>>>"),
+		).
+		SelectNextItem().
+		PressPrimaryAction() // pick "two"
+
+	continueMerge()
+
+	t.Views().Commits().
+		Focus().
+		Lines(
+			Contains("commit two").IsSelected(),
+			Contains("commit three"),
+			Contains("commit one"),
+		).
+		Tap(func() {
+			t.Views().Main().Content(Contains("-three").Contains("+two"))
+		}).
+		SelectNextItem().
+		Tap(func() {
+			t.Views().Main().Content(Contains("-one").Contains("+three"))
+		})
+}