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: workflows, branches and conflicts v1.0.0

Use this resource to fix Git history and resolve branch conflicts

New

  • 379 downloads
  • 249 likes
  • 197 saves

Free

Install with the CLI

In a terminal, from the folder you want:

npx --yes palatekit@latest install git-workflow-fix-history

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 gives the exact commands for each case, such as undoing a commit, changing a message, reverting several commits or recovering a deleted file. It also proposes a branching strategy suited to the team.

Mostly picked by

Updated November 2, 2026

Card for the “Git: workflows, branches and conflicts” 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: undoing and fixing commits
  • SKILL.md: reverting commits and merges
  • references/CORE_CONCEPTS.md: core Git concepts

Good fit for

  • You pushed a commit to the wrong place and want to undo it
  • A merge produces conflicts you do not understand

Not for

    Tags

    • Git
    • commits
    • branches
    • conflicts

    About

    You say

    “I committed to main by mistake, how do I move it to a new branch?”

    Card for the “Git: workflows, branches and conflicts” skill

    Skill published by PCL Team 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 fix Git history and resolve branch conflicts
    3. Review and adjust the result

    Content preview

    Files

    • LICENSE10.9 KB
    • NOTICE-PALATEKIT.md0.5 KB
    • references/CORE_CONCEPTS.md12.2 KB
    • SKILL.md4.2 KB

    Origin and licence

    Listed unmodified

    Author
    PCL Team
    Source
    github.com/personamanagmentlayer/pcl/tree/79ccaa9820486121fa33aaa696ec16fa1607bf02/stdlib/tools/git-expert
    Licence
    Apache-2.0

    Notice

    « git-expert » (PCL Team, 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.