Every premium and members-only resource for $9.99/month, as a no-commitment subscription. See the plans

PalateKit

Sign in
Menu

Request a resource

Describe the resource you are missing in one sentence. We will email you when it is published.

0 / 280

A page, a video or an image online.

Unlock PalateKit

Unlock everything

Plan

Paying means accepting our terms of sale.

Secure payment by Stripe. Receipts and invoices sent by email.

Welcome back

Sign in to install, download or save this resource. A free account is enough for free resources.

Resolving merge conflicts and validating v1.0.0

Use this resource to resolve a branch's merge conflicts to a buildable state

New

  • 319 downloads
  • 153 likes
  • 188 saves

Free

Install with the CLI

In a terminal, from the folder you want:

npx --yes palatekit@latest install merge-conflict-resolution

With no option, the skill goes to ~/.agents/skills/; add --agent claude-code (or codex, cursor…) to target an agent.

First time: connect the CLI with

npx --yes palatekit@latest login

The agent detects the conflicting files and fixes them with minimal edits, keeping both sides when that is safe. It regenerates lockfiles with the package manager, runs the build and tests, then reports the decisions it made.

Mostly picked by

Updated November 2, 2026

Card for the “Resolving merge conflicts and validating” skill

Details

Works in
Install guides
Generates with
Your agent's model
Licence
MIT

Similar resources

View all

What you get

  • SKILL.md: resolution and validation steps
  • SKILL.md: guardrails and decisions summarized in the output

Good fit for

  • A branch cannot be merged because of conflicts
  • A lockfile is in conflict and must be regenerated

Not for

    Tags

    • conflict
    • merge
    • git
    • tests
    • lockfile

    About

    You say

    “Resolve the conflicts of this branch with main and check that it builds.”

    Card for the “Resolving merge conflicts and validating” skill

    Skill published by michael-denyer under the MIT license, delivered in its original version.

    Show more

    How to use it

    1. Install the skill in your agent's skills folder
    2. Ask your agent to resolve a branch's merge conflicts to a buildable state
    3. Review and adjust the result

    Content preview

    Files

    • LICENSE1.1 KB
    • NOTICE-PALATEKIT.md0.5 KB
    • SKILL.md1 KB

    Origin and licence

    Listed unmodified

    Author
    michael-denyer
    Source
    github.com/michael-denyer/pstack-claude/tree/c121342e98da25e9f905ce39e9a59525046566d6/plugins/pstack/skills/fix-merge-conflicts
    Licence
    MIT

    Notice

    « fix-merge-conflicts » (michael-denyer, MIT) livré dans sa version d'origine : fiche en français et en anglais par PalateKit.

    User reviews

    –

    No ratings yet

    Loading reviews…

    Delete your review?

    Your rating and comment will be removed from the page.