Error code

A resolution does not apply to this merge

A resolution you sent names a conflict this merge does not have, so it was worked out from a different diff.

Fig. 03 Ratchet and pawlThe wheel turns freely one way, and the pawl stops it turning back.

Code: MERGE_RESOLUTION_REJECTED
Management API: 400

What to do

Read the merge's diff again and compute the resolutions from it. Adding more resolutions will not help.

The response

Every refusal is an application/problem+json document. Its detail says what went wrong in that request; its type is this page.

{
  "code": "MERGE_RESOLUTION_REJECTED",
  "type": "https://coho-cms.com/errors/merge-resolution-rejected",
  "title": "A resolution does not apply to this merge",
  "status": 400,
  "detail": "What went wrong in this request, in a sentence.",
  "instance": "/v1/projects/…"
}

Every code

The error codes, in a table with a filter.