mergelisted

# merge — Branch Absorption Absorb feature branches into the base branch. Per-branch rebase-vs-merge recommendation, mechanical execution. **Conflict resolution is NOT this skill's job** — abort, surface, stop. ## Branch Absorption Lane (load-bearing) Branch integration is a topology operation on the commit graph. Route through the merge tool — `git merge`, this skill, or worker-direct-merge. File extension is not a routing signal; a docs-only branch is still branch integration. ### Pre-flight when integration is in scope Triggers: branch named for absorption, current branch behind base, worker returned with branch unmerged. 1. `git branch --no-merged <base>` — list unmerged tips. 2. For any file slated for edit: `git log <base>..<branch> -- <path>`. Non-empty → merge lane. 3. To inspect merge state, materialize it: `git merge --no-commit --no-ff <branch>`, then `git merge --abort`. Read `git diff <base>..<branch>` for review only, never as input to a hand-applied edit across base. ## Conflict Doctrine (load-bearing) When `git merge` or `git rebase` produces conflicts: 1. **Abort immediately** — `git merge --abort` (for merge) or `git rebase --abort` (for rebase). Restore the working tree. 2. **Surface, don't resolve.** Output the branch name, the conflict file list (`git diff --name-only --diff-filter=U` captured BEFORE abort), and which strategy hit the conflict. 3. **Stop the run.** Do not attempt resolution — resolution never runs inside this skill. The step-2 su