Skip to main content
affpapa.org
RU EN
skill Claude Code CX Codex Cursor GitHub Copilot

fix-merge-conflicts — Claude Code skill

Resolves merge conflicts in a branch, then checks the build and tests before wrapping up. Use it when several conflicted files need focused fixes without a refactor.

Install into Claude Code · Skills CLI (Vercel) All methods and platforms ↓ 
npx skills add cursor/plugins --skill fix-merge-conflicts -a claude-code
Open on GitHub

What fix-merge-conflicts does

The skill finds conflicted files through git status and conflict markers, then applies small corrections with correctness as the priority. It keeps changes from both sides when that is safe; otherwise it selects the version that compiles and preserves public behaviour.

Lockfiles are regenerated with package-manager tools rather than edited by hand. The workflow then runs the build, linting, and relevant tests. Resolved files are staged, followed by a summary of the main decisions.

It does not push changes or create tags. You still need to handle the final branch push yourself.

What it helps with

  • find every file with a merge conflict
  • remove conflict markers from source files
  • retain compatible changes from both branches
  • regenerate lockfiles with package-manager tools
  • check the build and relevant tests

Example prompts for the agent

  • Use `fix-merge-conflicts` to resolve conflicts in the current branch.
  • Run `fix-merge-conflicts` and validate the build after the fixes.
  • Use `fix-merge-conflicts` to handle conflicted files, regenerate lockfiles, and stage the resolved changes.

How to install fix-merge-conflicts

1Skills CLI (Vercel)

npx skills add cursor/plugins --skill fix-merge-conflicts -a claude-code

2Manually: put the files in place

~/.claude/skills/fix-merge-conflicts/SKILL.md

Copy the whole skill folder; for one project use .claude/skills/fix-merge-conflicts/

From the same set18

The whole set →
unslop cursor This skill removes common AI writing patterns, filler, and vague phrasing while keeping the meaning and intended tone. Use it when polishing text. Claude Code CX Codex Cursor +1 27,700installs thermo-nuclear-code-quality-review cursor Runs a strict maintainability audit of code changes, abstractions, large files, and branching complexity. Use it when a routine review needs deeper structural scrutiny. Claude Code CX Codex Cursor +1 22,200installs deslop cursor Inspects branch diffs against main to remove AI-generated code clutter and inconsistent styling. Ideal for polishing branch changes before pull request review. Claude Code CX Codex Cursor +1 9,300installs how cursor Explores codebase architecture and runtime execution paths before you edit code. Helps determine module ownership, layering, and placement for new features. Claude Code CX Codex Cursor +1 5,900installs why cursor The skill investigates why code took its current shape by checking Git history and available MCP sources, then returns cited findings about decisions and tradeoffs. Claude Code CX Codex Cursor +1 5,700installs thermo-nuclear-review cursor A skill for comprehensive analysis of branch changes: checks code for bugs, broken functionality, security vulnerabilities, and feature-gate leaks. Use when you need thorough review before merge. Claude Code CX Codex Cursor +1 2,700installs review-and-ship cursor This skill automates code review before shipping: checks for bugs, tests, and intent fit, then commits and opens a PR. Use it to verify your work is ready before merge. Claude Code CX Codex Cursor +1 2,500installs weekly-review cursor This skill pulls your commits from the past 7–10 days, groups them by work type, and produces a brief report for status updates and retrospectives. Requires a configured git with email set. Claude Code CX Codex Cursor +1 2,400installs

Similar

github-workflow-automation sickn33 A skill that hands the agent patterns for GitHub work: AI-assisted PR review, issue triage, Actions workflows, CI/CD hooks, rebases and cherry-picks. Claude Code CX Codex Cursor +1 1,500installs gh-issue-sync mitsuhiko Syncs GitHub Issues into local Markdown files for triage, search, editing, and issue creation from an editor or terminal. Claude Code CX Codex Cursor +1 23,300installs Hooks Automation ruvnet A hooks system that automatically coordinates Claude Code operations, formats code, and learns from development patterns. Manages agents, persists session context, and integrates with MCP tools. Claude Code CX Codex Cursor +1 1,100installs pr-review MiniMax-AI Two-phase pull request review for skill repositories, combining automated schema checks with content audits. Claude Code CX Codex Cursor +1 1,800installs project-session-manager Yeachan-Heo Automates creation of separate git worktrees for each task, PR, or feature, with optional tmux session orchestration. Work on multiple branches in parallel without conflicts. Claude Code CX Codex Cursor +1 861installs second-opinion trailofbits Runs external CLI code reviews via Codex or Antigravity. It inspects dirty working trees, branch diffs, and specific commits without editing files. Claude Code CX Codex Cursor +1 5,200installs triage Matt Pocock This skill moves issues and external PRs through triage states, verification, and agent briefs. It fits maintainers managing an issue queue. Claude Code 990,453installs code-review Matt Pocock Reviews changes from a chosen reference point against repository standards and the originating spec. Use it for a branch, PR, or work in progress. Claude Code 789,521installs

Questions about fix-merge-conflicts

How do I install fix-merge-conflicts in Claude Code?

Run npx skills add cursor/plugins --skill fix-merge-conflicts -a claude-code, then run npx skills add cursor/plugins --skill fix-merge-conflicts -a claude-code again. The skill file is placed at ~/.claude/skills/fix-merge-conflicts/SKILL.md.

What does fix-merge-conflicts do?

It detects merge conflicts, resolves them with minimal edits, and checks the result with a build, linting, and relevant tests. It then stages resolved files and reports the decisions made.

Does fix-merge-conflicts push changes to the remote repository?

No. The skill does not push changes or create tags while resolving conflicts.

See also

Project sponsors

Companies that keep this analytics open
Gold sponsor
Nutra.Club

Impressions, clicks and code copies — open statistics. We keep the numbers public for the same reason NeBlask itself is public. Become a sponsor