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.

Git conflict resolution (merge, rebase) v1.0.0

Use this resource to resolve Git merge, rebase or cherry-pick conflicts without losing either side's behavior

New

  • 591 downloads
  • 183 likes
  • 173 saves

Free

Install with the CLI

In a terminal, from the folder you want:

npx --yes palatekit@latest install git-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 distinguishes textual from semantic conflicts, inspects the operation in progress, then revalidates the integration. It does not abort the operation, rewrite remote history or pick a whole side without authorization.

Mostly picked by

Updated November 2, 2026

Card for the “Git conflict resolution (merge, rebase)” 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 revalidation method
  • references/standards.md: merge and integration rules

Good fit for

  • A rebase stopped with conflicting files
  • Two branches changed the same function in incompatible ways

Not for

    Tags

    • git
    • conflicts
    • rebase
    • merge

    About

    You say

    “Resolve the conflicts from my rebase onto main without losing the changes from the payments branch.”

    Card for the “Git conflict resolution (merge, rebase)” skill

    Skill published by promovaweb 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 Git merge, rebase or cherry-pick conflicts without losing either side's behavior
    3. Review and adjust the result

    Content preview

    Files

    • agents/openai.yaml0.3 KB
    • LICENSE1.3 KB
    • NOTICE-PALATEKIT.md0.5 KB
    • references/standards.md4 KB
    • SKILL.md6 KB

    Origin and licence

    Listed unmodified

    Author
    promovaweb
    Source
    github.com/promovaweb/specsfy/tree/0213e1bbd42ae6b64a33f95ad7c4d42723528e6f/specialists/specsfy-specialist-merge-conflict-resolution
    Licence
    MIT

    Notice

    « specsfy-specialist-merge-conflict-resolution » (promovaweb, 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.