Resolve Merge Conflicts

Goal-aware resolution of rebase conflicts when merging a conflict-resolution worktree back into the integration branch. Analyzes the intent of each side of a conflict, resolves it in-place when confidence is HIGH or MEDIUM, and escalates when LOW.

5 stars 1 forksGit & Code Review

Install

skills CLI (Claude Code, Cursor, Codex and more)
npx skills add TalonT-Org/AutoSkillit --skill resolve-merge-conflicts
Manual install
git clone --depth 1 https://github.com/TalonT-Org/AutoSkillit.git /tmp/AutoSkillit
mkdir -p ~/.claude/skills
cp -r /tmp/AutoSkillit/src/autoskillit/skills_extended/resolve-merge-conflicts ~/.claude/skills/resolve-merge-conflicts

Personal skills live in ~/.claude/skills. Use .claude/skills in a project folder to share a skill with your team.

From the SKILL.md

# Resolve Merge Conflicts Skill

## Arguments (positional)

- `{worktree_path}` — absolute path to the existing worktree (must exist; rebase was aborted cleanly)
- `{plan_path}` — absolute path to the implementation plan (`{{AUTOSKILLIT_TEMP}}/make-plan/…_plan_….md`, relative to the current working directory)
- `{base_branch}` — the integration branch to rebase onto (e.g. `integration/run-N`)

## Critical Constraints

**NEVER:**
- Run the full test suite — that is the pipeline `test` step's responsibility; tests already passed before `merge_to_integration` was attempted
- Attempt partial resolution when any conflict file is LOW confidence — abort and escalate instead
- Leave unresolved conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`) in any file
- Loop back to the calling pipeline step — emit output tokens and exit cleanly
- Exceed 3 rebase continuation rounds — abort and escalate if exceeded

**ALWAYS:**
- Run `git rebase --abort` before emitting `escalation_required=true`
- Emit both `escalation_required=true` and `escalation_reason=` when escalating
- Emit `worktree_path=` and `branch_name=` on successful resolution
- Run `pre-commit run --all-files` after a successful rebase before emitting output tokens
- Validate all three positional arguments before touching git state
- Write `conflict_resolution_report_*.md` to `{{AUTOSKILLIT_TEMP}}/resolve-merge-conflicts/` and emit `conflict_report_path=` after successful conflict resolution

## When to Use
Read the full skill on GitHub

Details

Skill name
resolve-merge-conflicts
Path
src/autoskillit/skills_extended/resolve-merge-conflicts/SKILL.md
License
MIT
Repo updated
8 November 2026

FAQ

What does the Resolve Merge Conflicts skill do?

Goal-aware resolution of rebase conflicts when merging a conflict-resolution worktree back into the integration branch. Analyzes the intent of each side of a conflict, resolves it in-place when confidence is HIGH or MEDIUM, and escalates when LOW.

How do I install the Resolve Merge Conflicts skill?

skills CLI (Claude Code, Cursor, Codex and more): npx skills add TalonT-Org/AutoSkillit --skill resolve-merge-conflicts. Skills go in ~/.claude/skills (personal) or .claude/skills (project), and Claude loads them automatically when a task matches the description.

Is Resolve Merge Conflicts popular?

It lives in TalonT-Org/AutoSkillit, which has 5 GitHub stars and 1 forks.

Related skills

Analyze Prs

5

TalonT-Org/AutoSkillit

Analyze all open PRs targeting a base branch — determine merge order, identify file overlaps, and tag each PR as simple or needs_check for complexity. Use at the start of a PR consolidation workflow.

Git & Code Review

Arch Lens C4 Container

5

TalonT-Org/AutoSkillit

Create C4 Container architecture diagram showing static structure, building blocks, and technology choices. Anatomical lens answering "How is it built?

Software Development

Arch Lens Concurrency

5

TalonT-Org/AutoSkillit

Create Concurrency architecture diagram showing parallel execution patterns, thread pools, synchronization, and barriers. Physiological lens answering "How does parallelism work?

Software Development

Resolve Review

5

TalonT-Org/AutoSkillit

Fetch PR review comments, run intent validation (ACCEPT/REJECT/DISCUSS) before applying fixes, and post inline replies. MCP-only — used exclusively by recipe orchestration via run_skill after review_pr reports changes_requested or needs_human verdict.

Git & Code Review

Promote to Main

5

TalonT-Org/AutoSkillit

Promote integration to main with comprehensive changelog and PR creation. Use when user says "promote to main", "open promotion PR", "integration to main", or "create release PR to main". Runs pre-flight checks, change inventory, architecture diagrams, and creates a rich PR with release notes and traceability.

Git & Code Review

Retry Worktree

5

TalonT-Org/AutoSkillit

Worktree retry executor. ALWAYS invoke this skill when instructed to continue or retry an implementation in an existing worktree. Do not resume editing files directly — use this skill first to load the retry workflow.

Git & Code Review

Browse the most popular Claude skills, all git & code review skills, or write your own with the skills generator.