---
name: resolve-merge-conflicts
description: |
  Resolve merge conflicts safely by understanding both sides, preserving intended behavior, editing conflicted files, running validation, and reporting decisions. Use when a branch, pull request, merge, rebase, or cherry-pick has conflicts that need resolution.
---

# Resolve Merge Conflicts

Use this skill when git conflicts need careful resolution.

Read `references/workflow.md`, inspect both sides before editing, and validate after resolving.

## Documentation Output

When writing plans, reports, PRDs, briefs, findings, story tracking, scratch notes, or other generated documentation, write them under the repository-root `docs/` directory, preferably `docs/resolve-merge-conflicts/...` or the specific `docs/` path named in the workflow. Do not use `.agents/`, `.pi/`, `.codex/`, `.claude/`, or other agent-specific directories for generated documentation.