Merge branch 'id-expose-ancestor-path-for-conflicts-rpc' into 'master'

Expose ancestor path in Conflicts RPC

See merge request gitlab-org/gitaly!2672

8 files changed, 136 insertions, 69 deletions

diff --git a/changelogs/unreleased/id-expose-ancestor-path-for-conflicts-rpc.yml b/changelogs/unreleased/id-expose-ancestor-path-for-conflicts-rpc.yml
new file mode 100644
index 000000000..2be187353
--- /dev/null
+++ b/changelogs/unreleased/id-expose-ancestor-path-for-conflicts-rpc.yml
@@ -0,0 +1,5 @@
+---
+title: Expose ancestor path in Conflicts RPC
+merge_request: 2672
+author:
+type: changed
diff --git a/internal/gitaly/service/conflicts/list_conflict_files.go b/internal/gitaly/service/conflicts/list_conflict_files.go
index b1c9d8cb6..4c43ce10b 100644
--- a/internal/gitaly/service/conflicts/list_conflict_files.go
+++ b/internal/gitaly/service/conflicts/list_conflict_files.go
@@ -69,10 +69,11 @@ func (s *server) listConflictFiles(request *gitalypb.ListConflictFilesRequest, s
 		conflictFiles = append(conflictFiles, &gitalypb.ConflictFile{
 			ConflictFilePayload: &gitalypb.ConflictFile_Header{
 				Header: &gitalypb.ConflictFileHeader{
-					CommitOid: request.OurCommitOid,
-					TheirPath: []byte(conflict.Their.Path),
-					OurPath:   []byte(conflict.Our.Path),
-					OurMode:   conflict.Our.Mode,
+					CommitOid:    request.OurCommitOid,
+					TheirPath:    []byte(conflict.Their.Path),
+					OurPath:      []byte(conflict.Our.Path),
+					AncestorPath: []byte(conflict.Ancestor.Path),
+					OurMode:      conflict.Our.Mode,
 				},
 			},
 		})
diff --git a/internal/gitaly/service/conflicts/list_conflict_files_test.go b/internal/gitaly/service/conflicts/list_conflict_files_test.go
index 56386aba1..b77a389c0 100644
--- a/internal/gitaly/service/conflicts/list_conflict_files_test.go
+++ b/internal/gitaly/service/conflicts/list_conflict_files_test.go
@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/stretchr/testify/require"
 	"gitlab.com/gitlab-org/gitaly/internal/git"
 	"gitlab.com/gitlab-org/gitaly/internal/metadata/featureflag"
@@ -83,9 +82,7 @@ end
 	}
 
 	c, err := client.ListConflictFiles(ctx, request)
-	if err != nil {
-		t.Fatal(err)
-	}
+	require.NoError(t, err)
 
 	expectedFiles := []*conflictFile{
 		{
@@ -112,11 +109,66 @@ end
 	require.Len(t, receivedFiles, len(expectedFiles))
 
 	for i := 0; i < len(expectedFiles); i++ {
-		require.True(t, proto.Equal(receivedFiles[i].header, expectedFiles[i].header))
+		testhelper.ProtoEqual(t, receivedFiles[i].header, expectedFiles[i].header)
 		require.Equal(t, expectedFiles[i].content, receivedFiles[i].content)
 	}
 }
 
+func TestSuccessfulListConflictFilesRequestWithAncestor(t *testing.T) {
+	testListConflictFiles(t, testSuccessfulListConflictFilesRequestWithAncestor)
+}
+
+func testSuccessfulListConflictFilesRequestWithAncestor(t *testing.T, ctx context.Context) {
+	serverSocketPath, stop := runConflictsServer(t)
+	defer stop()
+
+	client, conn := NewConflictsClient(t, serverSocketPath)
+	defer conn.Close()
+
+	testRepo, _, cleanupFn := testhelper.NewTestRepo(t)
+	defer cleanupFn()
+
+	ourCommitOid := "824be604a34828eb682305f0d963056cfac87b2d"
+	theirCommitOid := "1450cd639e0bc6721eb02800169e464f212cde06"
+
+	request := &gitalypb.ListConflictFilesRequest{
+		Repository:     testRepo,
+		OurCommitOid:   ourCommitOid,
+		TheirCommitOid: theirCommitOid,
+	}
+
+	c, err := client.ListConflictFiles(ctx, request)
+	require.NoError(t, err)
+
+	expectedFiles := []*conflictFile{
+		{
+			header: &gitalypb.ConflictFileHeader{
+				CommitOid:    ourCommitOid,
+				OurMode:      int32(0100644),
+				OurPath:      []byte("files/ruby/popen.rb"),
+				TheirPath:    []byte("files/ruby/popen.rb"),
+				AncestorPath: []byte("files/ruby/popen.rb"),
+			},
+		},
+		{
+			header: &gitalypb.ConflictFileHeader{
+				CommitOid:    ourCommitOid,
+				OurMode:      int32(0100644),
+				OurPath:      []byte("files/ruby/regex.rb"),
+				TheirPath:    []byte("files/ruby/regex.rb"),
+				AncestorPath: []byte("files/ruby/regex.rb"),
+			},
+		},
+	}
+
+	receivedFiles := getConflictFiles(t, c)
+	require.Len(t, receivedFiles, len(expectedFiles))
+
+	for i := 0; i < len(expectedFiles); i++ {
+		testhelper.ProtoEqual(t, receivedFiles[i].header, expectedFiles[i].header)
+	}
+}
+
 func TestListConflictFilesHugeDiff(t *testing.T) {
 	testListConflictFiles(t, testListConflictFilesHugeDiff)
 }
@@ -154,23 +206,19 @@ func testListConflictFilesHugeDiff(t *testing.T, ctx context.Context) {
 
 	receivedFiles := getConflictFiles(t, c)
 	require.Len(t, receivedFiles, 2)
-	require.True(t,
-		proto.Equal(&gitalypb.ConflictFileHeader{
-			CommitOid: our,
-			OurMode:   int32(0100644),
-			OurPath:   []byte("a"),
-			TheirPath: []byte("a"),
-		}, receivedFiles[0].header),
-	)
-
-	require.True(t,
-		proto.Equal(&gitalypb.ConflictFileHeader{
-			CommitOid: our,
-			OurMode:   int32(0100644),
-			OurPath:   []byte("b"),
-			TheirPath: []byte("b"),
-		}, receivedFiles[1].header),
-	)
+	testhelper.ProtoEqual(t, &gitalypb.ConflictFileHeader{
+		CommitOid: our,
+		OurMode:   int32(0100644),
+		OurPath:   []byte("a"),
+		TheirPath: []byte("a"),
+	}, receivedFiles[0].header)
+
+	testhelper.ProtoEqual(t, &gitalypb.ConflictFileHeader{
+		CommitOid: our,
+		OurMode:   int32(0100644),
+		OurPath:   []byte("b"),
+		TheirPath: []byte("b"),
+	}, receivedFiles[1].header)
 }
 
 func buildCommit(t *testing.T, ctx context.Context, repo *gitalypb.Repository, repoPath string, files map[string][]byte) string {
diff --git a/proto/conflicts.proto b/proto/conflicts.proto
index 489066cab..c8f3e46f2 100644
--- a/proto/conflicts.proto
+++ b/proto/conflicts.proto
@@ -32,6 +32,7 @@ message ConflictFileHeader {
   bytes their_path = 3;
   bytes our_path = 4;
   int32 our_mode = 5;
+  bytes ancestor_path = 6;
 }
 
 message ConflictFile {
diff --git a/proto/go/gitalypb/conflicts.pb.go b/proto/go/gitalypb/conflicts.pb.go
index 3c77b71e3..343ed50bc 100644
--- a/proto/go/gitalypb/conflicts.pb.go
+++ b/proto/go/gitalypb/conflicts.pb.go
@@ -84,6 +84,7 @@ type ConflictFileHeader struct {
 	TheirPath            []byte   `protobuf:"bytes,3,opt,name=their_path,json=theirPath,proto3" json:"their_path,omitempty"`
 	OurPath              []byte   `protobuf:"bytes,4,opt,name=our_path,json=ourPath,proto3" json:"our_path,omitempty"`
 	OurMode              int32    `protobuf:"varint,5,opt,name=our_mode,json=ourMode,proto3" json:"our_mode,omitempty"`
+	AncestorPath         []byte   `protobuf:"bytes,6,opt,name=ancestor_path,json=ancestorPath,proto3" json:"ancestor_path,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -142,6 +143,13 @@ func (m *ConflictFileHeader) GetOurMode() int32 {
 	return 0
 }
 
+func (m *ConflictFileHeader) GetAncestorPath() []byte {
+	if m != nil {
+		return m.AncestorPath
+	}
+	return nil
+}
+
 type ConflictFile struct {
 	// Types that are valid to be assigned to ConflictFilePayload:
 	//	*ConflictFile_Header
@@ -489,47 +497,48 @@ func init() {
 func init() { proto.RegisterFile("conflicts.proto", fileDescriptor_28fc8937e7d75862) }
 
 var fileDescriptor_28fc8937e7d75862 = []byte{
-	// 630 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x41, 0x6f, 0xd3, 0x30,
-	0x14, 0x9e, 0xbb, 0xae, 0x6b, 0xdf, 0xb2, 0xad, 0xb3, 0x40, 0xcb, 0x2a, 0x4d, 0xcb, 0x32, 0x26,
-	0x05, 0x04, 0xed, 0x34, 0x38, 0x70, 0x9b, 0xd4, 0x69, 0x30, 0x4d, 0x4c, 0x20, 0x23, 0x2e, 0x5c,
-	0xa2, 0x34, 0xf1, 0x1a, 0xa3, 0x34, 0x0e, 0xb6, 0x33, 0xa9, 0x7f, 0x82, 0x2b, 0x1c, 0x39, 0xf0,
-	0x5b, 0xf8, 0x0b, 0xfc, 0x17, 0x24, 0x24, 0x54, 0x3b, 0xc9, 0xba, 0xb5, 0x1d, 0x27, 0x6e, 0xf1,
-	0xf7, 0xbe, 0x7c, 0xef, 0xf3, 0x7b, 0x9f, 0x0c, 0x9b, 0x21, 0x4f, 0xaf, 0x12, 0x16, 0x2a, 0xd9,
-	0xcd, 0x04, 0x57, 0x1c, 0x37, 0x86, 0x4c, 0x05, 0xc9, 0xb8, 0x03, 0x09, 0x4b, 0x95, 0xc1, 0x3a,
-	0x96, 0x8c, 0x03, 0x41, 0x23, 0x73, 0x72, 0x7f, 0x20, 0xb0, 0xdf, 0x30, 0xa9, 0x4e, 0x8b, 0x3f,
-	0x5f, 0xb1, 0x84, 0x4a, 0x42, 0x3f, 0xe7, 0x54, 0x2a, 0xfc, 0x12, 0x40, 0xd0, 0x8c, 0x4b, 0xa6,
-	0xb8, 0x18, 0xdb, 0xc8, 0x41, 0xde, 0xda, 0x31, 0xee, 0x1a, 0xcd, 0x2e, 0xa9, 0x2a, 0xfd, 0xfa,
-	0xb7, 0x9f, 0x4f, 0x11, 0x99, 0xe2, 0xe2, 0x47, 0xb0, 0xc1, 0x73, 0xe1, 0x87, 0x7c, 0x34, 0x62,
-	0xca, 0xe7, 0x2c, 0xb2, 0x6b, 0x0e, 0xf2, 0x5a, 0xc4, 0xe2, 0xb9, 0x38, 0xd5, 0xe0, 0x5b, 0x16,
-	0x61, 0x0f, 0xda, 0x2a, 0xa6, 0xec, 0x16, 0x6f, 0x59, 0xf3, 0x36, 0x34, 0x5e, 0x31, 0xdd, 0x2f,
-	0x08, 0xf0, 0xb4, 0xc5, 0x73, 0x1a, 0x44, 0x54, 0xe0, 0x5d, 0x80, 0x99, 0x16, 0xad, 0xb0, 0xd2,
-	0xdf, 0x05, 0x30, 0xfa, 0x59, 0xa0, 0x62, 0xad, 0x6c, 0x91, 0x96, 0x46, 0xde, 0x05, 0x2a, 0xc6,
-	0x3b, 0xd0, 0x9c, 0x98, 0xd4, 0xc5, 0xba, 0x2e, 0xae, 0xf2, 0xfc, 0x56, 0x69, 0xc4, 0x23, 0x6a,
-	0xaf, 0x38, 0xc8, 0x5b, 0xd1, 0xa5, 0x4b, 0x1e, 0xd1, 0x8b, 0x7a, 0x13, 0xb5, 0x6b, 0xee, 0x18,
-	0xac, 0x69, 0x3f, 0xf8, 0x05, 0x34, 0x62, 0xed, 0xa9, 0x18, 0x53, 0xa7, 0x1c, 0xd3, 0xac, 0xeb,
-	0xf3, 0x25, 0x52, 0x70, 0x71, 0x07, 0x56, 0x43, 0x9e, 0x2a, 0x9a, 0x2a, 0x6d, 0xde, 0x3a, 0x5f,
-	0x22, 0x25, 0xd0, 0xdf, 0x86, 0x87, 0xe5, 0x3a, 0xfd, 0x2b, 0x96, 0x50, 0x3f, 0x0b, 0xc6, 0x09,
-	0x0f, 0x22, 0xf7, 0x35, 0xec, 0xcc, 0xd9, 0x98, 0xcc, 0x78, 0x2a, 0x29, 0x7e, 0x02, 0x2b, 0x13,
-	0xb2, 0xb4, 0x91, 0xb3, 0xec, 0xad, 0x1d, 0x3f, 0x98, 0x67, 0x83, 0x18, 0x8a, 0xfb, 0xa7, 0x06,
-	0xbb, 0x84, 0x4a, 0x9e, 0x5c, 0xd3, 0xb2, 0x5c, 0xae, 0xbe, 0x98, 0xef, 0xff, 0x0e, 0xc0, 0x09,
-	0x6c, 0xa9, 0x40, 0x0c, 0xa9, 0xf2, 0xa7, 0xda, 0x2c, 0x2f, 0x6a, 0x43, 0xda, 0x86, 0x7c, 0x83,
-	0xcc, 0x4d, 0x50, 0x7d, 0x5e, 0x82, 0xf0, 0x01, 0xac, 0x4b, 0x9e, 0x8b, 0x90, 0xfa, 0x03, 0x11,
-	0xa4, 0x61, 0xac, 0xd7, 0x6a, 0x11, 0xcb, 0x80, 0x7d, 0x8d, 0x4d, 0x48, 0x85, 0x9f, 0x82, 0xd4,
-	0x30, 0x24, 0x03, 0x16, 0xa4, 0x43, 0xd8, 0x28, 0xba, 0x8d, 0xa8, 0x94, 0xc1, 0x90, 0xda, 0xab,
-	0x9a, 0xb5, 0x6e, 0xd0, 0x4b, 0x03, 0x62, 0x07, 0xea, 0xb9, 0xa4, 0xc2, 0x6e, 0xea, 0xeb, 0x58,
-	0xe5, 0x75, 0x3e, 0x48, 0x2a, 0x88, 0xae, 0xb8, 0xdf, 0x11, 0x6c, 0x2f, 0x98, 0x3f, 0x3e, 0xb9,
-	0x93, 0xa7, 0xc3, 0x9b, 0x71, 0xdc, 0xb3, 0xb0, 0xa9, 0x68, 0xed, 0x01, 0xe8, 0x2d, 0xfb, 0x9f,
-	0x24, 0x4f, 0xab, 0x74, 0xb5, 0x34, 0x76, 0x21, 0x79, 0xda, 0x3f, 0x80, 0x7d, 0x61, 0xb4, 0xfc,
-	0xea, 0xd9, 0xf0, 0x85, 0x51, 0xab, 0xb2, 0x76, 0x06, 0xf6, 0x6c, 0xc3, 0x22, 0x6a, 0x8f, 0xa1,
-	0xad, 0x05, 0x72, 0xc5, 0x78, 0xea, 0x53, 0x21, 0xb8, 0x31, 0xdb, 0x22, 0x9b, 0x37, 0xf8, 0xd9,
-	0x04, 0x3e, 0xfe, 0x85, 0xa0, 0x5d, 0x09, 0xbc, 0xa7, 0xe2, 0x9a, 0x85, 0x14, 0x0f, 0x60, 0x6b,
-	0x26, 0xc7, 0xd8, 0x29, 0xef, 0xb9, 0xe8, 0x51, 0xea, 0xec, 0xdf, 0xc3, 0x30, 0xce, 0xdc, 0xc6,
-	0xef, 0xaf, 0x5e, 0xad, 0x59, 0x3b, 0x42, 0xd8, 0x87, 0xf6, 0x5d, 0xff, 0x78, 0xef, 0x1f, 0xa3,
-	0xec, 0x38, 0x8b, 0x09, 0xb7, 0x1a, 0x20, 0x0f, 0xf5, 0x8f, 0x3e, 0x4e, 0xc8, 0x49, 0x30, 0xe8,
-	0x86, 0x7c, 0xd4, 0x33, 0x9f, 0xcf, 0xb8, 0x18, 0xf6, 0x8c, 0x44, 0x4f, 0xbf, 0xb2, 0xbd, 0x21,
-	0x2f, 0xce, 0xd9, 0x60, 0xd0, 0xd0, 0xd0, 0xf3, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x26,
-	0x14, 0x93, 0xad, 0x05, 0x00, 0x00,
+	// 646 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0xd1, 0x6e, 0xd3, 0x30,
+	0x14, 0x9d, 0xbb, 0xae, 0x6b, 0xef, 0xb2, 0xad, 0xb3, 0x40, 0xcb, 0x2a, 0x4d, 0xcb, 0x32, 0x26,
+	0x05, 0x04, 0xed, 0x34, 0x78, 0xe0, 0x6d, 0x52, 0xa7, 0xc1, 0x34, 0x31, 0x81, 0x8c, 0x78, 0xe1,
+	0x25, 0x4a, 0x13, 0xaf, 0x35, 0x4a, 0xe3, 0x60, 0x3b, 0x93, 0xfa, 0x25, 0xf0, 0xc8, 0x03, 0x7f,
+	0xc0, 0x3f, 0xf0, 0x0b, 0xfc, 0x0b, 0x12, 0x12, 0x8a, 0x9d, 0x64, 0xdd, 0xda, 0x8e, 0x27, 0xde,
+	0x92, 0x73, 0x8f, 0xcf, 0x3d, 0xbe, 0xf7, 0xc8, 0xb0, 0x19, 0xf2, 0xe4, 0x2a, 0x66, 0xa1, 0x92,
+	0xdd, 0x54, 0x70, 0xc5, 0x71, 0x63, 0xc8, 0x54, 0x10, 0x4f, 0x3a, 0x10, 0xb3, 0x44, 0x19, 0xac,
+	0x63, 0xc9, 0x51, 0x20, 0x68, 0x64, 0xfe, 0xdc, 0xef, 0x08, 0xec, 0x37, 0x4c, 0xaa, 0xd3, 0xe2,
+	0xe4, 0x2b, 0x16, 0x53, 0x49, 0xe8, 0xe7, 0x8c, 0x4a, 0x85, 0x5f, 0x02, 0x08, 0x9a, 0x72, 0xc9,
+	0x14, 0x17, 0x13, 0x1b, 0x39, 0xc8, 0x5b, 0x3b, 0xc6, 0x5d, 0xa3, 0xd9, 0x25, 0x55, 0xa5, 0x5f,
+	0xff, 0xfa, 0xf3, 0x29, 0x22, 0x53, 0x5c, 0xfc, 0x08, 0x36, 0x78, 0x26, 0xfc, 0x90, 0x8f, 0xc7,
+	0x4c, 0xf9, 0x9c, 0x45, 0x76, 0xcd, 0x41, 0x5e, 0x8b, 0x58, 0x3c, 0x13, 0xa7, 0x1a, 0x7c, 0xcb,
+	0x22, 0xec, 0x41, 0x5b, 0x8d, 0x28, 0xbb, 0xc5, 0x5b, 0xd6, 0xbc, 0x0d, 0x8d, 0x57, 0x4c, 0xf7,
+	0x07, 0x02, 0x3c, 0x6d, 0xf1, 0x9c, 0x06, 0x11, 0x15, 0x78, 0x17, 0x60, 0xa6, 0x45, 0x2b, 0xac,
+	0xf4, 0x77, 0x01, 0x8c, 0x7e, 0x1a, 0xa8, 0x91, 0x56, 0xb6, 0x48, 0x4b, 0x23, 0xef, 0x02, 0x35,
+	0xc2, 0x3b, 0xd0, 0xcc, 0x4d, 0xea, 0x62, 0x5d, 0x17, 0x57, 0x79, 0x76, 0xab, 0x34, 0xe6, 0x11,
+	0xb5, 0x57, 0x1c, 0xe4, 0xad, 0xe8, 0xd2, 0x25, 0x8f, 0x28, 0x3e, 0x80, 0xf5, 0x20, 0x09, 0xa9,
+	0x54, 0xbc, 0x38, 0xda, 0xd0, 0x47, 0xad, 0x12, 0xcc, 0xcf, 0x5f, 0xd4, 0x9b, 0xa8, 0x5d, 0x73,
+	0x27, 0x60, 0x4d, 0x9b, 0xc6, 0x2f, 0xa0, 0x31, 0xd2, 0xc6, 0x8b, 0x59, 0x76, 0xca, 0x59, 0xce,
+	0x5e, 0xed, 0x7c, 0x89, 0x14, 0x5c, 0xdc, 0x81, 0xd5, 0x90, 0x27, 0x8a, 0x26, 0x4a, 0xdf, 0xd0,
+	0x3a, 0x5f, 0x22, 0x25, 0xd0, 0xdf, 0x86, 0x87, 0xe5, 0xce, 0xfd, 0x2b, 0x16, 0x53, 0x3f, 0x0d,
+	0x26, 0x31, 0x0f, 0x22, 0xf7, 0x35, 0xec, 0xcc, 0x59, 0xab, 0x4c, 0x79, 0x22, 0x29, 0x7e, 0x02,
+	0x2b, 0x39, 0x59, 0xda, 0xc8, 0x59, 0xf6, 0xd6, 0x8e, 0x1f, 0xcc, 0xb3, 0x41, 0x0c, 0xc5, 0xfd,
+	0x53, 0x83, 0x5d, 0x42, 0x25, 0x8f, 0xaf, 0x69, 0x59, 0x2e, 0xf3, 0x51, 0x2c, 0xe1, 0x7f, 0xa7,
+	0xe4, 0x04, 0xb6, 0x54, 0x20, 0x86, 0x54, 0xf9, 0x53, 0x6d, 0x96, 0x17, 0xb5, 0x21, 0x6d, 0x43,
+	0xbe, 0x41, 0xe6, 0xc6, 0xac, 0x3e, 0x2f, 0x66, 0xf9, 0x6e, 0x25, 0xcf, 0x44, 0x48, 0xfd, 0x81,
+	0x08, 0x92, 0x70, 0xa4, 0x77, 0x6f, 0x11, 0xcb, 0x80, 0x7d, 0x8d, 0xe5, 0xa4, 0xc2, 0x4f, 0x41,
+	0x2a, 0x02, 0x60, 0xc0, 0x82, 0x74, 0x08, 0x1b, 0x45, 0xb7, 0x31, 0x95, 0x32, 0x18, 0x52, 0x7b,
+	0x55, 0xb3, 0xd6, 0x0d, 0x7a, 0x69, 0x40, 0xec, 0x40, 0x3d, 0x93, 0x54, 0xd8, 0x4d, 0x7d, 0x1d,
+	0xab, 0xbc, 0xce, 0x07, 0x49, 0x05, 0xd1, 0x15, 0xf7, 0x1b, 0x82, 0xed, 0x05, 0xf3, 0xc7, 0x27,
+	0x77, 0xf2, 0x74, 0x78, 0x33, 0x8e, 0x7b, 0x16, 0x36, 0x15, 0xad, 0x3d, 0x00, 0xbd, 0x65, 0xff,
+	0x93, 0xe4, 0x49, 0x95, 0xae, 0x96, 0xc6, 0x2e, 0x24, 0x4f, 0xfa, 0x07, 0xb0, 0x2f, 0x8c, 0x96,
+	0x5f, 0xbd, 0x2d, 0xbe, 0x30, 0x6a, 0x55, 0xd6, 0xce, 0xc0, 0x9e, 0x6d, 0x58, 0x44, 0xed, 0x31,
+	0xb4, 0xb5, 0x40, 0xa6, 0x18, 0x4f, 0x7c, 0x2a, 0x04, 0x37, 0x66, 0x5b, 0x64, 0xf3, 0x06, 0x3f,
+	0xcb, 0xe1, 0xe3, 0x5f, 0x08, 0xda, 0x95, 0xc0, 0x7b, 0x2a, 0xae, 0x59, 0x48, 0xf1, 0x00, 0xb6,
+	0x66, 0x72, 0x8c, 0x9d, 0xf2, 0x9e, 0x8b, 0x5e, 0xae, 0xce, 0xfe, 0x3d, 0x0c, 0xe3, 0xcc, 0x6d,
+	0xfc, 0xfe, 0xe2, 0xd5, 0x9a, 0xb5, 0x23, 0x84, 0x7d, 0x68, 0xdf, 0xf5, 0x8f, 0xf7, 0xfe, 0x31,
+	0xca, 0x8e, 0xb3, 0x98, 0x70, 0xab, 0x01, 0xf2, 0x50, 0xff, 0xe8, 0x63, 0x4e, 0x8e, 0x83, 0x41,
+	0x37, 0xe4, 0xe3, 0x9e, 0xf9, 0x7c, 0xc6, 0xc5, 0xb0, 0x67, 0x24, 0x7a, 0xfa, 0x29, 0xee, 0x0d,
+	0x79, 0xf1, 0x9f, 0x0e, 0x06, 0x0d, 0x0d, 0x3d, 0xff, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x80, 0x8f,
+	0x22, 0x49, 0xd2, 0x05, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/ruby/lib/gitaly_server/conflicts_service.rb b/ruby/lib/gitaly_server/conflicts_service.rb
index 90d3a762b..d1f487d96 100644
--- a/ruby/lib/gitaly_server/conflicts_service.rb
+++ b/ruby/lib/gitaly_server/conflicts_service.rb
@@ -76,7 +76,8 @@ module GitalyServer
         commit_oid: file.commit_oid,
         their_path: file.their_path.b,
         our_path: file.our_path.b,
-        our_mode: file.our_mode
+        our_mode: file.our_mode,
+        ancestor_path: file.ancestor_path&.b
       )
     end
 
diff --git a/ruby/lib/gitlab/git/conflict/file.rb b/ruby/lib/gitlab/git/conflict/file.rb
index 6f7874582..762b82707 100644
--- a/ruby/lib/gitlab/git/conflict/file.rb
+++ b/ruby/lib/gitlab/git/conflict/file.rb
@@ -4,7 +4,7 @@ module Gitlab
       class File
         UnsupportedEncoding = Class.new(StandardError)
 
-        attr_reader :their_path, :our_path, :our_mode, :repository, :commit_oid
+        attr_reader :their_path, :our_path, :our_mode, :ancestor_path, :repository, :commit_oid
 
         attr_accessor :raw_content
 
@@ -14,6 +14,7 @@ module Gitlab
           @their_path = conflict[:theirs][:path]
           @our_path = conflict[:ours][:path]
           @our_mode = conflict[:ours][:mode]
+          @ancestor_path = conflict.dig(:ancestor, :path)
           @raw_content = raw_content
         end
 
diff --git a/ruby/proto/gitaly/conflicts_pb.rb b/ruby/proto/gitaly/conflicts_pb.rb
index 2ae48859b..7ee2fb9e4 100644
--- a/ruby/proto/gitaly/conflicts_pb.rb
+++ b/ruby/proto/gitaly/conflicts_pb.rb
@@ -17,6 +17,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :their_path, :bytes, 3
       optional :our_path, :bytes, 4
       optional :our_mode, :int32, 5
+      optional :ancestor_path, :bytes, 6
     end
     add_message "gitaly.ConflictFile" do
       oneof :conflict_file_payload do