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 Git merge conflicts v1.0.0

Use this resource to resolve content conflicts from a merge, rebase or cherry-pick without rewriting a published branch

New

  • 329 downloads
  • 247 likes
  • 249 saves

Free

Install with the CLI

In a terminal, from the folder you want:

npx --yes palatekit@latest install resolve-git-merge-conflicts

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 inspects the conflicting files and works through a cascade: repairing squash residue, resolving structural conflicts, then fixing what remains by hand. It keeps the original branch so you can recover, and never pushes or force-pushes. You get a repository ready to continue the Git operation.

Mostly picked by

Updated November 2, 2026

Card for the “Resolving Git merge conflicts” skill

Details

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

Similar resources

View all

What you get

  • SKILL.md: resolution steps, from squash repair to continuing the operation
  • references/: resolution cascade and the Git commands to use

Good fit for

  • A rebase stopped on content conflicts
  • A cherry-pick or pull left unmerged files

Not for

    Tags

    • git conflicts
    • rebase
    • merge
    • branches

    About

    You say

    “Resolve the conflicts from my rebase on feature/payments, and do not push anything.”

    Card for the “Resolving Git merge conflicts” skill

    Skill published by paulnsorensen 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 content conflicts from a merge, rebase or cherry-pick without rewriting a published branch
    3. Review and adjust the result

    Content preview

    Files

    • LICENSE1.1 KB
    • NOTICE-PALATEKIT.md0.5 KB
    • references/cascade-stages.md3.1 KB
    • references/commands.md0.9 KB
    • scripts/melt.pyz2,786.8 KB
    • SKILL.md5.9 KB
    • wedge.toml0.3 KB

    Origin and licence

    Listed unmodified

    Author
    paulnsorensen
    Source
    github.com/paulnsorensen/easy-cheese/tree/b4843e531e73be70dd02f776995c1561f7ca033b/skills/melt
    Licence
    MIT

    Notice

    « melt » (paulnsorensen, 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.