Reintegrate Alignment Branch
reintegrate_branchMerges an edited branch (proposal Territory Solution from extract_tal_branch) back into the master. Needs branch_metadata and expected_master_revision; returns STALE_TS_REVISION when the master changed since the extract, in which case a fresh extract is needed. Merges apply one at a time.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| master_ts | No | ||
| proposal_ts | No | ||
| map_session_id | No | ||
| branch_metadata | Yes | ||
| master_ts_handle | No | ||
| proposal_ts_handle | No | ||
| expected_master_revision | Yes | ||
| expected_master_content_hash | No |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
No arguments | |||