diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-06-14 12:47:27 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-06-15 09:46:57 +0300 |
| commit | fc261b66a9545acbebfbd87727471bbd18c325d9 (patch) | |
| tree | 9b477599d97ef1b99348494b2e0255b3b84d231c /proto/cleanup.proto | |
| parent | 4e84eaf02f3a5403ef44c3f51b8e46c57e24ed02 (diff) | |
operations: Provide conflicting commits on merge conflict error
The structured `MergeConflictError` provides information about the files
that have been conflicting, but it doesn't provide any information about
the revisions that caused the merge conflict. While that info should in
the general case already be available on the calling-side, it may not
necessarily be in case the caller e.g. only specified branch names
instead of commit IDs.
Add a new `ConflictingCommitIDs` field to the message that contains the
object IDs of the conflicting commits to provide additional context.
Diffstat (limited to 'proto/cleanup.proto')
0 files changed, 0 insertions, 0 deletions