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.

Merge the session branch v1.0.0

Use this resource to merge the session branch into the base branch

New

  • 545 downloads
  • 150 likes
  • 212 saves

Free

Install with the CLI

In a terminal, from the folder you want:

npx --yes palatekit@latest install merge-session-branch

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 commits pending changes, merges the session branch into the base branch in the main worktree, then handles conflicts. You get a merge done without force-push or deleted commits.

Mostly picked by

Updated November 2, 2026

Card for the “Merge the session branch” skill

Details

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

Similar resources

View all

What you get

  • SKILL.md: git safety rules
  • SKILL.md: merge steps across worktrees
  • SKILL.md: conflict resolution and validation

Good fit for

  • Your session work is ready to join the main branch
  • A merge produced conflicts to resolve

Not for

    Tags

    • merge
    • git
    • branch
    • conflicts

    About

    You say

    “Merge my session into the base branch and resolve any conflicts.”

    Card for the “Merge the session branch” 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 the session branch into the base branch
    3. Review and adjust the result

    Content preview

    Files

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

    Origin and licence

    Listed unmodified

    Author
    microsoft
    Source
    github.com/microsoft/vscode/tree/c237f99ee87f8977a3e68b9ce797b8b8bd743201/src/vs/sessions/skills/merge
    Licence
    MIT

    Notice

    « 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.