Skip to content

operations: Return correct error code when merge fails

Patrick Steinhardt requested to merge pks-git2go-merge-precondition-failed into master

When the UserMergeToRef fails because of a conflict, then it's currently not using any gRPC error code but instead directly returns an internal error, where the Ruby implementation returned a PreconditionFailed error instead.

Fix this discrepancy by also returning a FailedPrecondition error. Adjust a test to pin down this error case.

Merge request reports