Error code

The merge needs decisions a human has to make

The two branches changed the same fields differently, and Coho does not choose between them for you. The response lists the conflicts.

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

Code: MERGE_CONFLICT
Management API: 400

What to do

Review the merge, choose a resolution for each conflict, and send the merge again with them.

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_CONFLICT",
  "type": "https://coho-cms.com/errors/merge-conflict",
  "title": "The merge needs decisions a human has to make",
  "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.