Overlap
overlapAnalyzes multiple branches against one base to reveal overlapping changes, shared commits, and merge-order hints, helping you detect conflicts and decide merge sequence.
Instructions
N branches against one base, each at its own merge-base: structures touched by 2+ branches (marked base(~/+/-) when the base itself changed them since the branches forked), new names introduced independently by 2+ branches, commits two branches share (a stack: overlap between them is expected; the residual beyond their shared commits is what stays), and per branch whether it is already in the base and by which criterion (ancestor / patch-equivalent / tree-equal; patch-equivalence proves it can be deleted, not that its content is in the current tree). Ends with a merge-order hint, not a verdict. The first line names the parts (branches, history, shared, colliding, order) with line counts; --part ID prints one part alone. Answers: do branches conflict or change the same functions; in which order to merge several branches; which commits two pull requests share. In your shell: sct overlap <base> <branch>... (if sct is not on PATH, "/app/.venv/bin/python" -m scantool.cli replaces sct).
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| base | Yes | ||
| kind | No | ||
| part | No | ||
| path | No | ||
| repo | No | ||
| branches | Yes | ||
| output_format | No | tree |