check_conflicts
Identify conflicts between your branch and partners' branches, reporting both file-level overlaps and actual merge conflicts via a dry-run git merge.
Instructions
Detect conflicts between your branch and your partners' branches.
Reports two levels:
claim_overlap : set intersection of touched files (intent level)
merge_conflict : a real dry-run merge via git merge-tree (textual)
against_branch lets you check one specific branch; default checks every branch named in a peer's active claim. Your own branch is taken from your current claim.
claim_overlap is intent-level, so it only exists where intent was declared. If against_branch names a branch no active claim mentions, claim_overlap is reported as an explicit {"status": "unknown"} object naming the reason — never as an empty list, which would read as a verified all-clear.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| against_branch | No |
Output Schema
| Name | Required | Description | Default |
|---|---|---|---|
| result | Yes |