localrepo: Rename `MergeTreeError` to `MergeTreeConflictError`

Currently `MergeTreeError` plays a dual role of holding conflict errors
and errors due to unrelated histories. Let's separate this, but first,
let's rename `MergeTreeError` to `MergeTreeConflictError`.

3 files changed, 13 insertions, 13 deletions

diff --git a/internal/git/localrepo/merge.go b/internal/git/localrepo/merge.go
index 79f3bd60b..db02187c3 100644
--- a/internal/git/localrepo/merge.go
+++ b/internal/git/localrepo/merge.go
@@ -100,7 +100,7 @@ func (repo *Repo) MergeTree(
 
 		if exitCode > 1 {
 			if text.ChompBytes(stderr.Bytes()) == "fatal: refusing to merge unrelated histories" {
-				return "", &MergeTreeError{
+				return "", &MergeTreeConflictError{
 					InfoMessage: "unrelated histories",
 				}
 			}
@@ -122,7 +122,7 @@ func (repo *Repo) MergeTree(
 // a MergeTreeResult struct. The format for the output can be found at
 // https://git-scm.com/docs/git-merge-tree#OUTPUT.
 func parseMergeTreeError(objectHash git.ObjectHash, cfg mergeTreeConfig, output string) (git.ObjectID, error) {
-	var mergeTreeError MergeTreeError
+	var mergeTreeError MergeTreeConflictError
 
 	lines := strings.SplitN(output, "\n\n", 2)
 
@@ -191,15 +191,15 @@ type ConflictingFileInfo struct {
 	Stage    MergeStage
 }
 
-// MergeTreeError encapsulates any conflicting file info and messages that occur
+// MergeTreeConflictError encapsulates any conflicting file info and messages that occur
 // when a merge-tree(1) command fails.
-type MergeTreeError struct {
+type MergeTreeConflictError struct {
 	ConflictingFileInfo []ConflictingFileInfo
 	InfoMessage         string
 }
 
 // Error returns the error string for a conflict error.
-func (c *MergeTreeError) Error() string {
+func (c *MergeTreeConflictError) Error() string {
 	// TODO: for now, it's better that this error matches the git2go
 	// error but once we deprecate the git2go code path in
 	// merges, we can change this error to print out the conflicting files
diff --git a/internal/git/localrepo/merge_test.go b/internal/git/localrepo/merge_test.go
index 576223f44..e8d1b432d 100644
--- a/internal/git/localrepo/merge_test.go
+++ b/internal/git/localrepo/merge_test.go
@@ -121,7 +121,7 @@ func TestMergeTree(t *testing.T) {
 				return setupData{
 					ours:        ours,
 					theirs:      theirs,
-					expectedErr: &MergeTreeError{InfoMessage: "unrelated histories"},
+					expectedErr: &MergeTreeConflictError{InfoMessage: "unrelated histories"},
 				}
 			},
 		},
@@ -168,7 +168,7 @@ func TestMergeTree(t *testing.T) {
 				return setupData{
 					ours:   ours,
 					theirs: theirs,
-					expectedErr: &MergeTreeError{
+					expectedErr: &MergeTreeConflictError{
 						ConflictingFileInfo: []ConflictingFileInfo{
 							{
 								FileName: "file2",
@@ -233,7 +233,7 @@ func TestMergeTree(t *testing.T) {
 				return setupData{
 					ours:   ours,
 					theirs: theirs,
-					expectedErr: &MergeTreeError{
+					expectedErr: &MergeTreeConflictError{
 						ConflictingFileInfo: []ConflictingFileInfo{
 							{
 								FileName: "file1",
@@ -292,7 +292,7 @@ func TestMergeTree(t *testing.T) {
 				return setupData{
 					ours:   ours,
 					theirs: theirs,
-					expectedErr: &MergeTreeError{
+					expectedErr: &MergeTreeConflictError{
 						ConflictingFileInfo: []ConflictingFileInfo{
 							{
 								FileName: "file2",
@@ -358,7 +358,7 @@ func TestMergeTree(t *testing.T) {
 				return setupData{
 					ours:   ours,
 					theirs: theirs,
-					expectedErr: &MergeTreeError{
+					expectedErr: &MergeTreeConflictError{
 						ConflictingFileInfo: []ConflictingFileInfo{
 							{
 								FileName: "file2",
@@ -435,7 +435,7 @@ func TestMergeTree(t *testing.T) {
 				return setupData{
 					ours:   ours,
 					theirs: theirs,
-					expectedErr: &MergeTreeError{
+					expectedErr: &MergeTreeConflictError{
 						ConflictingFileInfo: []ConflictingFileInfo{
 							{
 								FileName: "file1",
@@ -511,7 +511,7 @@ func TestMergeTree(t *testing.T) {
 				return setupData{
 					ours:   ours,
 					theirs: theirs,
-					expectedErr: &MergeTreeError{
+					expectedErr: &MergeTreeConflictError{
 						ConflictingFileInfo: []ConflictingFileInfo{
 							{
 								FileName: "file1",
diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go
index a35392b9a..4b0340eb6 100644
--- a/internal/gitaly/service/operations/merge.go
+++ b/internal/gitaly/service/operations/merge.go
@@ -154,7 +154,7 @@ func (s *Server) UserMergeBranch(stream gitalypb.OperationService_UserMergeBranc
 		firstRequest.CommitId)
 
 	if mergeErr != nil {
-		var conflictErr *localrepo.MergeTreeError
+		var conflictErr *localrepo.MergeTreeConflictError
 		if errors.As(mergeErr, &conflictErr) {
 			conflictingFiles := make([][]byte, 0, len(conflictErr.ConflictingFileInfo))
 			for _, conflictingFileInfo := range conflictErr.ConflictingFileInfo {