diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2020-10-05 16:37:25 +0300 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2020-10-14 09:51:09 +0300 |
| commit | a67612102ed6bb365f1de6572ecf2744e498bc73 (patch) | |
| tree | 7480ed918cb043caa4d0dcd64c868b9b372bf101 /proto/operations.proto | |
| parent | 243ffac8f0d03f3b61938f24358ca8ccd70f086c (diff) | |
Add option to include conflict markers to merge commit
Diffstat (limited to 'proto/operations.proto')
| -rw-r--r-- | proto/operations.proto | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/proto/operations.proto b/proto/operations.proto index 30305d289..d2a2680d6 100644 --- a/proto/operations.proto +++ b/proto/operations.proto @@ -183,6 +183,9 @@ message UserMergeToRefRequest { bytes target_ref = 5; bytes message = 6; bytes first_parent_ref = 7; + // Allow conflicts to occur. Any conflict markers will be part of the merge commit. + // Only text conflicts are handled, tree-based conflicts are not supported. + bool allow_conflicts = 8; } message UserMergeToRefResponse { |