What is a stacked branch in Git?

A stacked branch is a branch that depends on another feature branch rather than directly on the main production branch, allowing for incremental development and smaller, more focused pull requests.

How does git-chain handle merge conflicts?

Git-chain pauses the automated process when a conflict is detected, allowing the developer to resolve the conflict manually before using 'git rebase --continue' and resuming the chain update.

Can I use git-chain with existing branches?

Yes, you can use the 'git chain setup' command to organize existing branches into a chain or 'git chain init' to add your current branch to an existing sequence.

Should I use rebase or merge with git-chain?

Use 'rebase' if you want a clean, linear history (ideal for private branches), and use 'merge' if you need to preserve the exact commit history or are working on branches shared with other developers.

Git Chain

Name: Git Chain
Author: dashed

bydashed

•

デプロイメントとDevOps

Automates the management and rebasing of stacked Git branches to maintain clean hierarchies and linear history.

Git Chain is a specialized workflow skill that simplifies the management of dependent Git branches, commonly referred to as "stacked branches." It allows developers to define branch sequences where each branch builds upon the previous one, enabling automated rebasing or merging across the entire chain with a single command. This eliminates the manual and error-prone process of updating individual branches in a hierarchy when the root branch or intermediary branches change, making it an essential tool for developers working with multiple dependent pull requests or incremental feature development.

主な機能

01Automated multi-branch rebasing and merging

02Chain relationship tracking with root branch definitions

03Linear history maintenance for stacked pull requests

04Navigation commands for moving between chain levels

05Integrated backup and recovery mechanisms for safe branch operations

062 GitHub stars

ユースケース

01Propagating upstream changes through a hierarchy of feature branches

02Reorganizing and cleaning up complex branch histories before review

03Managing a series of dependent Pull Requests (Stacked PRs)

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add dashed/claude-marketplace git-chain

For use in Claude.ai and ChatGPT

Download Skill