CLI

ara resolve

Settle the conflicts ara merge left in a document: ara resolve levels/a.scene --pick e_b2:name=theirs (or --ours / --theirs for all)

Usage

ara resolve [OPTIONS] <FILE>

Arguments

<FILE>The conflicted document

Options

--oursKeep our side of every conflict not picked

--root <ROOT>Project root (default: the nearest ancestor with ara.project.json)

--jsonPrint results as JSON

--theirsKeep their side of every conflict not picked

--author <AUTHOR>Who protocol commands are attributed to: human or agent:<name> (default: ARA_AUTHOR, else the agent running this CLI, else human)

--pick <PICKS>One conflict: <record>:<path>=ours|theirs|base (<record>=… for a whole record). Repeatable

-h, --helpPrint help