diff options
| author | Christian Couder <chriscool@tuxfamily.org> | 2020-04-03 12:50:04 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2020-04-08 15:08:21 +0300 |
| commit | a9d5d0f2c34d6dd51de37871ee3bd15e9d4a61f9 (patch) | |
| tree | 5de429a857f48f999d520eb7b5b84580ed788136 | |
| parent | 04bc91132d3f704b0fe5dba3bc401099362f4bd4 (diff) | |
Update conflict error message in rebase_test.go
In Git 2.26.0, the default rebase backend has been changed from an
'apply' backend to a 'merge' backend. This means that the error
message that appears in case of conflict is different than what it
used to be.
Let's update this error message to the one produced by the 'merge'
backend in `rebase_test.go`.
| -rw-r--r-- | internal/service/operations/rebase_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/internal/service/operations/rebase_test.go b/internal/service/operations/rebase_test.go index 228284530..197e3cef7 100644 --- a/internal/service/operations/rebase_test.go +++ b/internal/service/operations/rebase_test.go @@ -387,7 +387,7 @@ func TestFailedUserRebaseConfirmableDueToGitError(t *testing.T) { firstResponse, err := rebaseStream.Recv() require.NoError(t, err, "receive first response") - require.Contains(t, firstResponse.GitError, "error: Failed to merge in the changes.") + require.Contains(t, firstResponse.GitError, "CONFLICT (content): Merge conflict in README.md") err = testhelper.ReceiveEOFWithTimeout(func() error { _, err = rebaseStream.Recv() |