fix-merge-conflicts
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
Install
Install this Claude and Codex skill with the command below. The command stays visible even when copy support is unavailable.
git clone https://github.com/cursor/plugins /tmp/plugins && ln -s /tmp/plugins/cursor-team-kit/skills/fix-merge-conflicts ~/.claude/skills/fix-merge-conflictsFrom README
Fix 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
More from this repo
check-compiler-errors
Used to run compile and type-check commands and report failures
control-cli
Used to build or adapt a local harness to drive, inspect, and profile an interactive CLI or TUI without external...
control-ui
Used to build or adapt a local browser/CDP harness to drive and inspect a web, IDE, or Electron UI.