Merge Conflict Resolution
Domain skill for detecting, classifying, and resolving git merge conflicts systematically.
Iron Law
NEVER silently drop changes. Every conflict resolution must account for both sides. If lines from either side are excluded, the rationale must be documented. When in doubt, ask the user rather than guess.
Conflict Detection
Detect conflicted files and their conflict types:
# List files with unmerged entries
git diff --name-only --diff-filter=U
#
[Description truncada. Veja o README completo no GitHub.]