diff options
| author | Piotr Stankowski <git@trakos.pl> | 2022-05-05 12:39:15 +0300 |
|---|---|---|
| committer | Piotr Stankowski <git@trakos.pl> | 2022-05-05 12:44:18 +0300 |
| commit | 49edca32c1d4c47f9b9fd384e532b45ea9e0212f (patch) | |
| tree | 650454defeaa6269c4bac8cb39c95c1ba5671a46 /proto/operations.proto | |
| parent | e694381a237da441dd8c5c955def41c48eade760 (diff) | |
operations: Change MergeSquashConflict comment in protobuf
When feature flag squash_using_merge is enabled, we are not
using rebase to merge. I'm clarifying it in the comment.
Diffstat (limited to 'proto/operations.proto')
| -rw-r--r-- | proto/operations.proto | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/proto/operations.proto b/proto/operations.proto index a7f240b0c..ec651e6cd 100644 --- a/proto/operations.proto +++ b/proto/operations.proto @@ -659,7 +659,8 @@ message UserSquashResponse { message UserRebaseConfirmableError { oneof error { // RebaseConflict is returned in case rebasing commits on top of the start - // commit fails with a merge conflict. + // commit fails with a merge conflict and in case merge squashing commits + // fails with a merge conflict. MergeConflictError rebase_conflict = 1; // AccessCheckError is returned in case GitLab's `/internal/allowed` endpoint rejected // the change. |