Resolve merge conflicts
deck_resolveResolve slide conflicts after a pull by choosing ours, theirs, or both sides for a file, slide, or all conflicts. Finish when the pulled version becomes the sync base, then check and publish.
Instructions
Settle conflicts: choice "ours" keeps this folder's side, "theirs" the web's, "both" keeps both (ours first — then edit the slide to blend them). Scope: path (a file), plus slide (1-based, as deck_conflicts says) or which (the conflict's index in the file); with neither, every conflict in the file; without path, every file. A side that deleted the slide or file removes it when chosen. When the last conflict goes, the pulled version becomes the sync base. Then deck_check and deck_publish.
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. | |
| path | No | e.g. deck.mdx or pages/intro.mdx | |
| slide | No | ||
| which | No | ||
| choice | Yes |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
| resolved | Yes | ||
| remaining | Yes |