fix-merge-conflicts

Fix merge conflicts is a compact, single-file skill from Cursor's team kit that resolves git merge conflicts non-interactively and drives a conflicted branch back to a buildable, tested state. It solves the routine but error-prone task of clearing conflict markers safely: rather than blindly picking a side, it aims for minimal, correctness-first edits and verification.

The documented workflow detects all conflicting files from git status and conflict markers, resolves each conflict with minimal edits, prefers preserving both sides when safe and otherwise chooses the variant that compiles and keeps public behavior stable, regenerates lockfiles with package-manager tools instead of hand-editing, runs compile/lint/relevant tests, and stages the resolved files with a summary of key decisions. Its guardrails keep changes minimal and readable, forbid leaving conflict markers behind, avoid broad refactors during resolution, and explicitly avoid pushing or tagging during the process. The output is a concise summary of files resolved, notable resolution choices, and build/test outcome.

This is a thin, self-contained procedural skill (a single SKILL.md with no scripts or references) aimed at developers who want a reliable, low-risk path through merge conflicts. It is best suited to conflict resolution during rebases and merges where a buildable end state and clear decision summary matter more than large-scale restructuring.