惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

WordPress大学
WordPress大学
大猫的无限游戏
大猫的无限游戏
B
Blog
阮一峰的网络日志
阮一峰的网络日志
IT之家
IT之家
Hugging Face - Blog
Hugging Face - Blog
博客园 - 【当耐特】
Jina AI
Jina AI
博客园 - 聂微东
T
The Blog of Author Tim Ferriss
宝玉的分享
宝玉的分享
L
LangChain Blog
M
MIT News - Artificial intelligence
Blog — PlanetScale
Blog — PlanetScale
腾讯CDC
酷 壳 – CoolShell
酷 壳 – CoolShell
Y
Y Combinator Blog
F
Fortinet All Blogs
H
Help Net Security
B
Blog RSS Feed
J
Java Code Geeks
Cyber Security Advisories - MS-ISAC
Cyber Security Advisories - MS-ISAC
Apple Machine Learning Research
Apple Machine Learning Research
S
SegmentFault 最新的问题

Butler's Log

Figma agent vs. one button: shipping design tokens to npm Local Model Performance on an M5 Max GitButler 0.22 - "Catch 22" Agentic Version Control Benchmarks Grit: rewriting Git in Rust with agents Git Merge 2026 Agent-safe Git with GitButler We’ve raised $17M to build what comes after Git Announcing the GitButler CLI for Linux The Great CSS Expansion A couple of git nits Simplifying Git by Using GitButler Introducing the GitButler CLI GitButler 0.19 - "Commander Keen" But Head: Crafting a Custom Font MCP vs RAG: Two Very Different Ways to Gain Context Getting Started With GitButler Agents Using the GitButler MCP Server to Build Better AI-Driven Git Workflows Using GitButler With Multiple GitHub Accounts Advent of Code! Upcoming GitButler Events Use GitButler for your Gerrit workflow Integrating GitButler and GitHub Enterprise Butler Flow: shipping code faster (but less like Alfred, more like CI on steroids) - Part 3 Butler Flow: shipping code faster (but less like Alfred, more like CI on steroids) - Part 2 Butler Flow: shipping code faster (but less like Alfred, more like CI on steroids) - Part 1 Grid Happens: Because Flexbox Wasn’t Enough Using Cursor Hooks for automatic version control Deep Dive into the new Cursor Hooks A Responsive Item Counter with CSS only
Stacked Branches with GitButler
Scott Chacon · 2024-12-05 · via Butler's Log

GitButler can now manage dependent branches that are stacked, including managing stacked GitHub PRs.

Stacked Branches with GitButler

With our new 0.14 release, GitButler can now stack your branches!

This means that you can start a new branch based off of another branch that it is dependent on and review each dependent group of commits independently.

Stacking your branches helps to solve the problem of reviewing dependent groups of code without having to pile them all into a single branch.

This not only makes it easier to review logical groups of code changes, but it also allows you to continue working on something while waiting for dependent branches to get merged.

For example, let's say that you are working on a new feature. You get the base of the feature ready to go out and start the process of getting it upstreamed into the main branch. As you're waiting for that process, you can then start a new branch based off of it. As you get feedback on the first branch, you can absorb or squash work into it while continuing to work on your new features too.

We also have GitHub Pull Request integration to add a nice status update to each of your stacked branches that tells everyone that this branch is part of a stack and what the status of each branch in the stack currently is:

Stacking branches also works great with our independent branching feature - you can even have multiple virtual branches each with stacks of branches in them.

Now, as you're working on your code, you can decide if the code you're working on is dependent on other code or not and organize your commits along those lines, quickly and easily.

Together with GitButler's drag and drop rebasing, squashing and splitting features, managing changes to your codebase is easier than ever.

To try out our new stacked branching features, download the new version of GitButler today and check out the docs.

Scott Chacon

Written by Scott Chacon

Scott Chacon is a co-founder of GitHub and GitButler, where he builds innovative tools for modern version control. He has authored Pro Git and spoken globally on Git and software collaboration.