operations: Make UserMergeBranch return PreconditionFailed on conflicts (!3700) · Merge requests · GitLab.org / gitaly

Pavlo Strokov requested to merge ps-precondition-fail-on-merge into master Jul 22, 2021

Changing error code from Unknown to PreconditionFailed if there are merge conflicts that prevent automatic merge on the branch. It is more correct API behavior as error is known. By changing the error reason we reduce amount of Unknown errors that are affecting our SL{A,O}s.

Closes: #3195 (closed)

Changelog: changed

operations: Make UserMergeBranch return PreconditionFailed on conflicts

Merge request reports