test-driven-development
OBobra/superpowers298k2,205 new stars in the last 7 days
fix-merge-conflicts
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
- Star
- 11,087
- Category
- Browser & testing
- Last commit
- Oct 13, 2026
cursor-team-kit/skills/fix-merge-conflicts/SKILL.md
View on GitHubFix merge conflicts
Trigger
Branch has unresolved merge conflicts and needs a reliable path to a buildable state.
Workflow
- Detect all conflicting files from git status and conflict markers.
- Resolve each conflict with minimal, correctness-first edits.
- Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable.
- Regenerate lockfiles with package manager tools instead of hand-editing.
- Run compile, lint, and relevant tests.
- Stage resolved files and summarize key decisions.
Guardrails
- Keep changes minimal and readable.
- Do not leave conflict markers in any file.
- Avoid broad refactors while resolving conflicts.
- Do not push or tag during conflict resolution.
Output
- Files resolved
- Notable resolution choices
- Build/test outcome
Similar Skills
migrate-to-shoehorn
MAmattpocock/skills288k8,502 new stars in the last 7 days
agent-runtime-gateway-smoke-test
AFaffaan-m/ECC278k3,369 new stars in the last 7 days
Featured
accessibility
Audit accessibility on Web, iOS, and Android to meet WCAG 2.2, with keyboard navigation and screen-reader support.
AFaffaan-m/ECC278k3,369 new stars in the last 7 days
ai-regression-testing
AFaffaan-m/ECC278k3,369 new stars in the last 7 days
Official
firecrawl-build-interact
FIfirecrawl/firecrawl191k1,648 new stars in the last 7 days