How does the --after-merge option work?

The --after-merge option automates the cleanup process after a PR is merged into main. It pulls the latest changes and uses 'git move' to restack any remaining local work onto the new merge commit.

Can this skill handle merge conflicts?

Yes, the skill detects conflicts during the sync process, identifies the specific files involved, and provides step-by-step instructions for resolution and continuation.

Do I need git-branchless installed to use this skill?

Yes, this skill acts as an intelligent wrapper for the git-branchless CLI. You must have the git-branchless suite installed on your local machine.

What is git-branchless and why is it used?

Git-branchless is a toolset that enables a 'stacked' workflow, allowing developers to manage multiple related commits without creating separate branches for every change. This skill automates that toolset.

Git-Branchless Stack Sync

Name: Git-Branchless Stack Sync
Author: jpoutrin

byjpoutrin

•

Developer Tools

Synchronizes stacked git commits with the main branch using git-branchless to automate rebasing and conflict resolution.

This skill automates the complex task of maintaining a stacked git workflow by integrating git-branchless commands directly into Claude. It simplifies fetching remote changes, rebasing multi-commit stacks onto the latest main branch, and performing post-merge cleanup after PRs are closed. By providing interactive conflict guidance and automated re-stacking, it ensures your development branch remains clean and synchronized without the manual overhead of traditional git rebase commands, making it ideal for developers working in high-velocity multi-agent environments.

Key Features

01Visual stack state visualization using git-branchless logic

02Interactive conflict resolution guidance and recovery

038 GitHub stars

04Smart post-merge cleanup for integrated pull requests

05Automated stack synchronization with the main branch

06Remote fetching and rebasing via single-command execution

Use Cases

01Cleaning up local environments and re-stacking work after a PR is merged

02Keeping a multi-commit feature stack updated with upstream changes

03Managing complex rebase operations across multiple dependent commits

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add jpoutrin/product-forge bl-sync

For use in Claude.ai and ChatGPT

Download Skill