diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-06-09 10:06:02 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-06-09 10:06:02 +0300 |
| commit | db54449bb40f94621573e6bab59440b1e2f582af (patch) | |
| tree | 062b00eb4ab975b3330715578daf478b6c56bcb4 /proto | |
| parent | 22f7db01953debe8e7c1c46ff2b1ffb5a143c566 (diff) | |
| parent | 8ea1987fd91810fe02bc3180f96729fddf5e74ee (diff) | |
Merge branch 'pb-auto-resolve-conflicts-other-scenarios' into 'master'
Auto-resolve other conflict scenarios when AllowConflicts is true
See merge request gitlab-org/gitaly!3504
Diffstat (limited to 'proto')
| -rw-r--r-- | proto/go/gitalypb/operations.pb.go | 4 | ||||
| -rw-r--r-- | proto/operations.proto | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/proto/go/gitalypb/operations.pb.go b/proto/go/gitalypb/operations.pb.go index f40f084f2..5ef16f66e 100644 --- a/proto/go/gitalypb/operations.pb.go +++ b/proto/go/gitalypb/operations.pb.go @@ -872,7 +872,9 @@ type UserMergeToRefRequest struct { // first parent of the computed merge. Overrides `branch`. FirstParentRef []byte `protobuf:"bytes,7,opt,name=first_parent_ref,json=firstParentRef,proto3" json:"first_parent_ref,omitempty"` // 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. + // When tree-based conflicts occur, no conflict markers will be added to the + // file on the merge commit. The `Their` side of the conflict will be kept and + // `Our` and `Ancestor` will be ignored. AllowConflicts bool `protobuf:"varint,8,opt,name=allow_conflicts,json=allowConflicts,proto3" json:"allow_conflicts,omitempty"` // timestamp is the optional timestamp to use for the merge commit. If it's // not set, the current time will be used. diff --git a/proto/operations.proto b/proto/operations.proto index d1cf73ec3..1ead16681 100644 --- a/proto/operations.proto +++ b/proto/operations.proto @@ -270,7 +270,9 @@ message UserMergeToRefRequest { // first parent of the computed merge. Overrides `branch`. 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. + // When tree-based conflicts occur, no conflict markers will be added to the + // file on the merge commit. The `Their` side of the conflict will be kept and + // `Our` and `Ancestor` will be ignored. bool allow_conflicts = 8; // timestamp is the optional timestamp to use for the merge commit. If it's // not set, the current time will be used. |