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 conflicts in a Git merge or rebase v1.0.0

Use this resource to resolve the conflicts of an ongoing merge or rebase

New

  • 505 downloads
  • 102 likes
  • 123 saves

Free

Install with the CLI

In a terminal, from the folder you want:

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

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

This skill helps the agent resolve an in-progress merge or rebase conflict: it reads the state and history, finds the intent behind each change, then settles each hunk while keeping both intents where possible. It then reruns the project's automated checks and never aborts the operation. You get a conflict resolved and verified.

Mostly picked by

Updated November 2, 2026

Card for the “Resolving conflicts in a Git merge or rebase” skill

Details

Works in
Install guides
Generates with
Your agent's model
Licence
Apache-2.0

Similar resources

View all

What you get

  • SKILL.md: resolution steps and rules for keeping intents
  • agents/openai.yaml: agent configuration

Good fit for

  • A rebase stopped on conflicts across several files
  • You do not know which version to keep in a merge

Not for

    Tags

    • Git
    • conflicts
    • merge
    • rebase
    • version control

    About

    You say

    “Resolve the conflicts in my rebase onto the main branch and rerun the tests.”

    Card for the “Resolving conflicts in a Git merge or rebase” skill

    Skill published by iamyoki under the Apache-2.0 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 the conflicts of an ongoing merge or rebase
    3. Review and adjust the result

    Content preview

    Files

    • agents/openai.yaml0.1 KB
    • LICENSE10.5 KB
    • NOTICE-PALATEKIT.md0.5 KB
    • SKILL.md0.9 KB

    Origin and licence

    Listed unmodified

    Author
    iamyoki
    Source
    github.com/iamyoki/qwen-image-2.1-skill/tree/32b8100e70299b56478a35a9f1d5703605cdba46/.agents/skills/resolving-merge-conflicts
    Licence
    Apache-2.0

    Notice

    « resolving-merge-conflicts » (iamyoki, Apache-2.0) 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.