merge-conflict-resolutionlisted

# 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: ```bash # List files with unmerged entries git diff --name-only --diff-filter=U # Full status with conflict markers git status --porcelain ``` Classify each file by its porcelain status prefix. ## Conflict Type Classification | Status | Type | Description | |--------|------|-------------| | UU | Content | Both sides modified the same file | | AA | Add-add | Both sides added a file with the same name | | UD | Delete-modify (ours deleted) | We deleted, they modified | | DU | Delete-modify (theirs deleted) | They deleted, we modified | | AU | Rename-related (add/unmerged) | Rename collision | | UA | Rename-related (unmerged/add) | Rename collision | ## Conflict Complexity Classification Assess each conflicted file's complexity before choosing a strategy: | Complexity | Description | Example | |------------|-------------|---------| | Trivial | Non-overlapping changes in different sections | Import added at top + function added at bottom | | Semantic | Changes to the same logical unit | Both sides modify the same function | | Structural | File was refactored on on