mcpField
R
resolve-merge-conflicts

resolve-merge-conflicts

github.com/dyritsDevelopment046 installsUpdated 1d ago
Repository

About resolve-merge-conflicts

A development skill for resolving merge conflicts according to a project's `resolve-conflicts.md` procedure. It also requires discovering and running automated checks before continuing stopped commits.

Key features

  1. 01Resolve conflicts using project procedure
  2. 02Identify automated checks
  3. 03Run checks before continuing commits
  4. 04Report failures with evidence

Use cases

  1. 01Resolve conflicts in a branch or merge request
  2. 02Validate a conflict resolution before continuing commits

Install

Copy the command and run it in a terminal.

$npx skills add https://github.com/dyrits/skills --skill resolve-merge-conflicts

After installing, type/resolve-merge-conflictsin Claude Code to confirm it loaded.

Bundled files

References and scripts installed along with SKILL.md.

apm.yml
agents/
openai.yaml
references/
resolve-conflicts.md

Details

From the project README

Resolve merge conflicts

  1. Resolve the conflicts following resolve-conflicts.md. The goal is the one stated for the operation: by the user, the branch, or the pull or merge request.

  2. Before its step 4 continues each stopped commit, discover the project's automated checks and run them, typically typecheck, then tests, then format. Fix anything the resolution broke.

Completion: the procedure's completion holds, and the checks from step 2 pass or each failure is reported with its evidence.

Comments

Markdown supported