SkillVaultskills Browse all 1,000+ skills

Maintenance · Version 1.3.0 · Reviewed 2026-08-02

Merge Conflict Resolution Planner

Reduce change risk for conflict intent reconstruction and source-of-truth resolution with evidence, explicit trade-offs, and a verification plan.

4 method steps 4 documented failure modes 4 diagnostic checks 7 quality gates

Explains and resolves merge conflicts from base, ours, and theirs while preserving both sides intent, generated-file rules, and post-resolution validation.

₹199 one-time

Get this skill archive

Install in your AI coding tool

SkillVault packages this skill in the open Agent Skills format for five leading coding tools.

What this skill helps you do

  • Conflict intent reconstruction
  • Source-of-truth resolution
  • Post-merge regression plan

How Merge Conflict Resolution Planner works

You provide

Current versions, changelogs, support dates, and coverage

It inspects

Breaking changes and transitive pins behind conflict intent reconstruction

It decides

A source-of-truth resolution sequence taking one major at a time

You verify

Suite green between increments with rollback proven

What it checks first

Merge Conflict Resolution Planner explains and resolves merge conflicts from base, ours, and theirs while preserving both sides intent, generated-file rules, and post-resolution validation. Use it when the work involves Conflict intent reconstruction, Source-of-truth resolution, Post-merge regression plan.

  1. Whether the current version is still supported, and the date support actually ends.
  2. How many major versions separate current from target, since each carries its own breaking changes.
  3. Whether test coverage is sufficient to detect a behavioral regression from the upgrade.
  4. Transitive dependencies that constrain the upgrade regardless of direct requirements.

Failure modes it recognizes

  • Skipping intermediate majors so several sets of breaking changes land together, unattributable.
  • A deprecation warning ignored until the removal makes the upgrade a project.
  • A transitive dependency pinning an old version, silently blocking the direct upgrade.
  • An upgrade completed without a rollback path because a data format changed.

Answers it will reject

  • Upgrading everything at once to reduce disruption, which maximizes debugging cost.
  • Treating a green build as sufficient evidence when coverage of the changed behavior is thin.
  • Deferring an end-of-life migration until support has already lapsed.

Decision rules it applies

  • Upgrade one major at a time with the suite green between each step.
  • Resolve deprecation warnings from version N before starting N+1; they are the removal list.
  • Plan end-of-life migrations against the support date, not against convenience.

Evidence it asks for

  • Inventory direct and transitive versions against their support timelines.
  • Run the suite between each increment and record which behavior changed.
  • Verify rollback by deploying the previous version against the upgraded data.

The method inside

  1. Inventory dependencies, compatibility constraints, and current behavior affecting conflict intent reconstruction.
  2. Create reversible seams for source-of-truth resolution before changing the critical path.
  3. Sequence post-merge regression plan into independently verifiable increments with explicit rollback points.
  4. Keep old and new paths observable until equivalence is proven; remove the fallback only after acceptance criteria pass.

Deliverables

  • Conflict intent reconstruction assessment
  • Source-of-truth resolution decision and action plan
  • Post-merge regression plan verification checklist

Evidence requirements

  • Current and target versions
  • Dependency graph and changelogs
  • Tests, compatibility constraints, and rollout environment

Quality gates

  • Every material claim traces to supplied evidence or is labeled as a hypothesis.
  • The response follows the declared deliverable contract.
  • No execution, access, measurement, or verification is invented.
  • Secrets and personal data are redacted rather than repeated.
  • The user receives a concrete independent verification step.
  • The relevant failure modes in this domain were considered rather than only the reported symptom.
  • No listed anti-pattern was recommended as a solution.

Example task

Input

Plan the resolution for these merge conflicts and identify which generated files should be regenerated instead of manually merged.

Expected output

Recover the merge base and explain what each side intended before editing markers. Resolve source files at the semantic boundary, regenerate derived artifacts from the chosen source, preserve independent behavior from both branches, and run focused tests that would fail if either intent was lost...

Boundaries and compatibility

Ideal for

  • Conflict intent reconstruction: produce a decision or artifact grounded in supplied evidence.
  • Source-of-truth resolution: produce a decision or artifact grounded in supplied evidence.
  • Post-merge regression plan: produce a decision or artifact grounded in supplied evidence.

Out of scope

  • Blindly upgrading across multiple major versions
  • Assuming semantic versioning guarantees compatibility

Agent compatibility

  • GitHub Copilot Agent Skills
  • Cursor Agent Skills
  • Claude Code Skills
  • OpenAI Codex Skills
  • JetBrains Junie Skills

Tool policy: Advisory by default. No tools are assumed. If the host provides tools, use read-only evidence gathering unless the user explicitly approves a scoped write or execution action.