Git merge and history reconciliation

Use for conflict resolution, merge review, squash or rebase integration, and reconciling divergent histories.

• Identify the exact source, target, topology, merge bases and requested result before integration. Preserve adequate authorized recovery artifacts before history or ref mutations, account for additions and deletions, and compare the final candidate with the retained source. A local rewrite does not authorize remote publication or force updates.
• Resolving conflicts: apply existing owner decisions to each conflict, preserve both compatible behaviors, regenerate derived artifacts through supported tools, and report unresolved material policy choices. A clean or marker-free merge alone does not prove that both parents' behavior survived.
• Reviewing a pinned merge (read-only): compare affected files and contracts against each parent, verify relevant tests and the actual conflict context, and report precise findings.

Read branch history and retirement and merge and parent review. For parent-by-parent and generated-artifact checks use merge parent evidence; for linked-worktree inclusion after squash integration use content coverage; for protected dirty content during an authorized squash use isolated squash integration. Follow the user, project and runtime authorization for each operation; this skill does not grant additional authority.