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 merge, rebase and conflict resolution v1.0.0

Use this resource to merge or rebase a Git branch and resolve conflicts

New

  • 418 downloads
  • 194 likes
  • 144 saves

Free

Install with the CLI

In a terminal, from the folder you want:

npx --yes palatekit@latest install git-merge-rebase-workflow

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 runs a merge, a rebase or a rebase --onto from the current branch, with optional review pauses and a final summary. You get a traceable result, and a push only if you have authorized it.

Mostly picked by

Updated November 2, 2026

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

Details

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

Similar resources

View all

What you get

  • SKILL.md: merge, rebase and rebase --onto options
  • SKILL.md: conflict review pauses and final summary

Good fit for

  • You need to bring a feature branch into main
  • A multi-commit rebase must be checked step by step

Not for

    Tags

    • git
    • merge
    • rebase
    • conflicts
    • branches

    About

    You say

    “Rebase my feature/export branch onto main and show me the conflicts.”

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

    Skill published by microsoft 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 merge or rebase a Git branch and resolve conflicts
    3. Review and adjust the result

    Content preview

    Files

    • LICENSE1.1 KB
    • NOTICE-PALATEKIT.md0.5 KB
    • SKILL.md2.7 KB

    Origin and licence

    Listed unmodified

    Author
    microsoft
    Source
    github.com/microsoft/hve-core/tree/854593cab3f35b3c57035c88794b705b4b64e6a0/.github/skills/hve-core/git-merge
    Licence
    MIT

    Notice

    « git-merge » (microsoft, 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.