COcomposal
merge_resolutions

Resolve a three-way file conflict after line merge and Mergiraf, using MagicMerge as last resort

post/api/v1/merge_resolutions

Request

  • Base URL
    https://composal.com (the document declares no server; this is the origin it was published from)
  • URL
    https://composal.com/api/v1/merge_resolutions
  • Auth
    HTTP bearer

Request body

pathstring

Repository-relative path of the conflicted file

basestring required

Common ancestor file contents

oursstring required

Current / left file contents

theirsstring required

Incoming / right file contents

contextobject

Optional surrounding files keyed by path

Response

Resolved file bytes, or resolved=false when the conflict is left intact

resolvedboolean required
actionstring required
fallbackboolean required
contentstring nullable
modelstring
duration_msinteger required

Changes

No recorded changes to this operation across all 3 revisions of this API.