1 files changed, 2 insertions, 4 deletions
diff --git a/proto/conflicts.proto b/proto/conflicts.proto
index 1ff17c7fc..d5dc7db06 100644
--- a/proto/conflicts.proto
+++ b/proto/conflicts.proto
@@ -10,19 +10,17 @@ service ConflictsService {
   rpc ListConflictFiles(ListConflictFilesRequest) returns (stream ListConflictFilesResponse) {
     option (op_type) = {
       op: ACCESSOR
-      target_repository_field: "1"
     };
   }
   rpc ResolveConflicts(stream ResolveConflictsRequest) returns (ResolveConflictsResponse) {
     option (op_type) = {
       op: MUTATOR
-      target_repository_field: "1.1"
     };
   }
 }
 
 message ListConflictFilesRequest {
-  Repository repository = 1;
+  Repository repository = 1 [(target_repository)=true];
   string our_commit_oid = 2;
   string their_commit_oid = 3;
 }
@@ -47,7 +45,7 @@ message ListConflictFilesResponse {
 }
 
 message ResolveConflictsRequestHeader {
-  Repository repository = 1;
+  Repository repository = 1 [(gitaly.target_repository)=true];
   string our_commit_oid = 2;
   Repository target_repository = 3;
   string their_commit_oid = 4;