List merge conflicts
deck_conflictsLists every unresolved merge conflict in a slide deck's files with file, slide, line, conflict kind, and both sides (ours, theirs, base) so you can inspect each side before resolving.
Instructions
Every unresolved merge conflict in the deck's files, structured: file, slide (counting from 1 in its file), line, kind (content / frontmatter / delete-edit / add-add), and the text of each side — ours (this folder), theirs (the web), base (what both started from). which is the conflict's index in its file, for deck_resolve. Read both sides before choosing.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| dir | No | Deck folder (contains deck.mdx). Absolute, or relative to the server's folder. Default: the server's folder. |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
| conflicts | Yes |