CLI

ara merge

Three-way merge of a document; writes the result over ours (git: %O %A %B)

Usage

ara merge [OPTIONS] <BASE> <OURS> <THEIRS>

Arguments

<BASE>Common ancestor

<OURS>Our version (overwritten with the result)

<THEIRS>Their version

Options

-o, --output <OUTPUT>Write the result here instead of over ours

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

--jsonPrint results as JSON

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

-h, --helpPrint help