merge-resolve
Installation
SKILL.md
Merge Resolve
Workflow
- Inspect conflicts and apply priority rules.
- Resolve and summarize changes.
- Run validation steps if requested.
Related skills
More from metta-ai/tribal-village
cleanup-refactor
Simplify code and remove legacy/backcompat shims while preserving behavior. Use when asked to clean up or simplify code.
23cleanup-audit
Audit for cleanup or complexity hotspots.
21pr-summary
Generate a PR title and description from the branch diff vs main. Use when asked for a PR summary or PR description.
20policy-save-load-audit
Audit policy save/load and checkpoint handling across metta/cogames to find compatibility risks or legacy shims. Use when save/load behavior is in question.
20tv-spelunk
Search codebase for a pattern and open top hits.
20include-sprawl-map
Map include chains and explain module relationships.
19