diff options
Diffstat (limited to 'pkg/integration/tests/sync/pull_rebase_interactive_conflict.go')
-rw-r--r-- | pkg/integration/tests/sync/pull_rebase_interactive_conflict.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go b/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go index 9e66f3bcd..a6a3f5356 100644 --- a/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go +++ b/pkg/integration/tests/sync/pull_rebase_interactive_conflict.go @@ -15,7 +15,8 @@ var PullRebaseInteractiveConflict = NewIntegrationTest(NewIntegrationTestArgs{ shell.Commit("one") shell.UpdateFileAndAdd("file", "content2") shell.Commit("two") - shell.EmptyCommit("three") + shell.CreateFileAndAdd("file3", "content3") + shell.Commit("three") shell.CloneIntoRemote("origin") @@ -24,7 +25,8 @@ var PullRebaseInteractiveConflict = NewIntegrationTest(NewIntegrationTestArgs{ shell.HardReset("HEAD^^") shell.UpdateFileAndAdd("file", "content4") shell.Commit("four") - shell.EmptyCommit("five") + shell.CreateFileAndAdd("file5", "content5") + shell.Commit("five") shell.SetConfig("pull.rebase", "interactive") }, |