contentrain_reconcile
Preview and execute a content-aware three-way merge to reconcile diverged contentrain and base-branch pairs, reporting conflicts for resolution.
Instructions
Reconcile a diverged contentrain ↔ base-branch pair with a content-aware three-way merge. DRY RUN (default, dry_run:true): reports what would merge and which conflicts need a decision — touches nothing. EXECUTE (dry_run:false): performs the merge as a two-parent commit on contentrain and fast-forwards the base branch. Everything one side changed merges mechanically (entry-, key-, term+locale-level); only the same item changed differently on both sides becomes a conflict. Answer conflicts by passing resolutions (from the dry-run ids) and running again — a resolution whose values changed since the dry-run is dropped and the conflict re-reported. Recommended workflow: always run dry_run first, review the summary and conflicts, then execute.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| dry_run | No | Defaults to preview mode (dry_run:true). Set dry_run:false to execute after reviewing the preview. | |
| resolutions | No | Decisions for conflicts reported by a previous dry-run, matched by id |