Resolving Merge Conflicts

Owns: intent-based merge-conflict resolution.

Use this skill for a repository that is already in an in-progress merge or rebase conflict. Do not start from a clean repository, create a merge, or begin a rebase merely to use it. The default mode is read-only discovery. An explicit request to resolve authorizes only edits to the named conflicted paths in a non-scheduler worktree; it does not grant Git lineage or publication authority.

Authority boundary

Authority is operation-scoped. Permission to inspect or edit a resolution does not authorize staging, committing, aborting, or continuing the merge or rebase. Require explicit caller authority separately before any of these operations: