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.

Branch strategy, rebase and Git conflicts v1.0.0

Use this resource to choose a Git strategy, resolve conflicts and repair history

New

  • 375 downloads
  • 146 likes
  • 168 saves

Free

Install with the CLI

In a terminal, from the folder you want:

npx --yes palatekit@latest install git-branching-rebase-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 helps you choose a branching strategy, decide between merge and rebase, resolve conflicts file by file and use cherry-pick, bisect or reflog. You get steps for the operation at hand, without rewriting shared branches.

Mostly picked by

Updated November 2, 2026

Card for the “Branch strategy, rebase and 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: branching strategies, merge versus rebase choice and conflict resolution
  • references/: advanced rebase and monorepo strategies
  • .claude-plugin/plugin.json: plugin metadata

Good fit for

  • A merge conflict spans several files
  • You need to find the commit that introduced a bug

Not for

    Tags

    • Git
    • rebase
    • conflicts
    • branches

    About

    You say

    “I have a conflict in three files after a rebase. Tell me what to keep from each side.”

    Card for the “Branch strategy, rebase and Git conflicts” skill

    Skill published by curiositech 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 choose a Git strategy, resolve conflicts and repair history
    3. Review and adjust the result

    Content preview

    Files

    • .claude-plugin/plugin.json0.5 KB
    • LICENSE1.1 KB
    • NOTICE-PALATEKIT.md0.5 KB
    • references/advanced-rebase-patterns.md3.2 KB
    • references/monorepo-git-strategies.md4.4 KB
    • SKILL.md13.5 KB

    Origin and licence

    Listed unmodified

    Author
    curiositech
    Source
    github.com/curiositech/some_claude_skills/tree/f49825290077e5fb46bb3e867dfa8a5b0161152b/.claude/skills/git-workflow-expert
    Licence
    MIT

    Notice

    « git-workflow-expert » (curiositech, 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.