Ara
Download

Search or run a command

Jump to a section or open an Ara link.

Protocol method · branch

branch.merge

Approve and merge a branch session now (humans only): field-level three-way merge with a conflict report.

  • Scope: edit:scene
  • Service: collab

Params

ParamRequiredDescription
sessionyesSession handle from session.begin (a human).
branchyesBranch ID (br_…).
preferWhich side wins fields both changed (default live).
forceLegacy compatibility flag; claims never block a merge.