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.

Resolve git merge conflicts file by file v1.0.0

Use this resource to resolve merge or rebase conflicts file by file

New

  • 548 downloads
  • 125 likes
  • 189 saves

Free

Install with the CLI

In a terminal, from the folder you want:

npx --yes palatekit@latest install resolve-git-merge-conflicts-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

The agent assesses the situation, sets zdiff3 if needed and resolves conflicts file by file. It applies specific patterns for config files such as JSON, then verifies and completes the operation. You get a report of the conflicts resolved.

Mostly picked by

Updated November 2, 2026

Card for the “Resolve git merge conflicts file by file” skill

Details

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

Similar resources

View all

What you get

  • SKILL.md: assessment, resolution and verification steps
  • SKILL.md: resolution patterns and JSON file handling

Good fit for

  • A rebase stops on conflicts across several files
  • A PR cannot merge because the branches have diverged

Not for

    Tags

    • git
    • conflicts
    • merge
    • rebase
    • zdiff3

    About

    You say

    “Resolve the conflicts from my rebase onto main and keep my changes in the JSON files.”

    Card for the “Resolve git merge conflicts file by file” skill

    Skill published by laurigates 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 or rebase conflicts file by file
    3. Review and adjust the result

    Content preview

    Files

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

    Origin and licence

    Listed unmodified

    Author
    laurigates
    Source
    github.com/laurigates/claude-plugins/tree/3cbda15de062aa6d3302afd330afb0ff1c8979df/git-plugin/skills/git-conflicts
    Licence
    MIT

    Notice

    « git-conflicts » (laurigates, 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.