lefant Git Resolve Merge Conflicts
Use this skill when the user asks for help resolving git merge conflicts.
This skill is the replacement for the old git_resolve_merge_conflicts command.
Workflow
- Identify conflicted files with git
- Inspect the conflict markers in each file
- Gather context from both sides of the merge:
git log --stat HEAD...MERGE_HEAD -- <files>git log --stat MERGE_HEAD...HEAD -- <files>
- Consult recent local context when helpful:
- recent devlogs
- plans
- specs
- ADRs
- Resolve each file according to intent
- Stage resolved files
- Complete the merge commit when the resolution is clear and the user has not asked to stop short
Resolution Heuristics
- Keep both sides when changes are complementary
- Prefer the clearer implementation when both sides solve the same problem differently
- Stay consistent on formatting-only conflicts
- Ask the user when the conflict implies contradictory logic or business rules
Autonomy Boundary
Proceed autonomously through stage and commit when the correct merge is clear.
Pause only when ambiguity could cause a logic bug, such as:
- conflicting business rules
- incompatible data model changes
- deletions that may break dependencies
Verification
After resolving, run the relevant tests or checks if practical.