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
| Param | Required | Description |
|---|---|---|
session | yes | Session handle from session.begin (a human). |
branch | yes | Branch ID (br_…). |
prefer | Which side wins fields both changed (default live). | |
force | Legacy compatibility flag; claims never block a merge. |