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

Use this resource to resolve merge, rebase, cherry-pick or stash-apply conflicts

New

  • 453 downloads
  • 201 likes
  • 110 saves

Free

Install with the CLI

In a terminal, from the folder you want:

npx --yes palatekit@latest install git-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 operation in progress and lists the conflicted files. It creates backups, analyses each conflict, then proposes a resolution. You get resolved files and backup copies.

Mostly picked by

Updated November 2, 2026

Card for the “Resolving Git conflicts” skill

Details

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

Similar resources

View all

What you get

  • SKILL.md: conflict-state detection, backups and per-file analysis
  • SKILL.md: reading of the <<<<<<< HEAD, ======= and >>>>>>> markers

Good fit for

  • A rebase or cherry-pick stops on several conflicted files
  • A stash apply leaves conflict markers to deal with

Not for

    Tags

    • git
    • conflicts
    • rebase
    • merge

    About

    You say

    “Resolve the conflicts from my rebase on main, keeping my changes in auth.ts.”

    Card for the “Resolving Git conflicts” skill

    Skill published by duc01226 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 merge, rebase, cherry-pick or stash-apply conflicts
    3. Review and adjust the result

    Content preview

    Files

    • LICENSE1 KB
    • NOTICE-PALATEKIT.md0.5 KB
    • SKILL.md14.5 KB

    Origin and licence

    Listed unmodified

    Author
    duc01226
    Source
    github.com/duc01226/easyplatform/tree/1b6bdf10470d5b99baf8a6802f674c12c17461e9/.agents/skills/git-conflict-resolve
    Licence
    MIT

    Notice

    « git-conflict-resolve » (duc01226, 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.