Agent skill · software engineering · cursor
fix-merge-conflicts
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
Why this skill is useful
Adds a non-interactive script for resolving merge conflicts that ensures correctness and preserves stability, which the AI wouldn't reliably generate on its own.
What it needs
About 1k tokens when loaded. Last updated 2026-08-06. 2,555 stars on the source repository.
What this skill does
Fix merge conflicts Trigger Branch has unresolved merge conflicts and needs a reliable path to a buildable state. Workflow 1. Detect all conflicting files from git status and conflict markers. 2. Resolve each conflict with minimal, correctness-first edits. 3. Prefer preserving both sides when safe. Otherwise, choose the variant that compiles and keeps public behavior stable. 4. Regenerate lockfiles with package manager tools instead of hand-editing. 5. Run compile, lint, and relevant tests. 6. 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
How to use it
Reference it in AdaL, Claude Code, Cursor or any coding agent — nothing to install:
@skills cursor/fix-merge-conflicts