zm.prConflicts

Read what stands between a pull request and a merge.

Returns the mergeability verdict, the merge base, both heads, and one entry per conflicting path. A conflicting TEXT path carries marked_text: the same <<<<<<< / ======= / >>>>>>> rendering a merge leaves in a working tree, with the source and target sides laid against their common ancestor. A binary path carries the two sides' hashes and no text, so pick a side.

Resolve a path by writing the settled bytes back to it and committing on the source branch. The request re-analyses on the next read, so a resolved path stops appearing here.

A mergeable request returns an empty conflict list. zm.prView says HOW MANY conflicts there are; this says WHAT they are.

zm.prConflicts(nil, 1)
zm.prConflicts("11111111-2222-3333-4444-555555555555", 3)