Video wird geladen...
Video konnte nicht geladen werden
gh stack CLI now supports git worktrees 🥞 You can manage stacks where each branch is in a separate worktree, while still taking advantages of things like cascading stack rebases
40,542 Aufrufe • vor 24 Tagen •via X (Twitter)
16 Kommentare

@github Stacked PRs are addictive. Once you start splitting, you can't stop. My agent made 2000-line diffs the norm, and nobody enjoys reviewing those. So I split a big booking flow bug fix into 4 PRs: refactor, old bugs, shared service, UI fixes. Will be reviewing them on Monday calmy

@github Oo nice! QQ. I've usually got several agents working in parallel, each in their own worktree in herdr. What happens if one of them runs a stack rebase while another agent is working on a different branch in the same stack?

@github How well does it work with the GH Copilot Desktop app and multiple threads / subagents? Did the stack skill also get an update as a part of this?

@github worktrees are the ultimate blast-radius isolation for agents: each branch in a separate checkout eliminates git index lock contention. in our pipeline targeting brazil, isolated worktrees let parallel agents test schema changes without disturbing production state. huge win

@github Manually resolve conflicts.

@github Your agents can use the CLI. It’s a wrapper around git rebase

@github Gave a try. Same bullshit as before, a little bit more pollished.

@github Please fix the CI bottleneck

@github can we also put the whole stack in the merge queue ?

@github Yes! We updated how stacks works with merge queue so it will always merge together in the same merge group

@github oh that sounds really nice

@github Have you guys thought about why we can’t merge the stack when 1 approval is needed even though all PRs in the stack are approved? It is a real blocker for us at the moment

@github We’re rolling out a fix for this next week. Sorry it’s taking so long, we needed to change a lot of security-related code

@github Yes!!!!

@github Any plans on being able to merge a stack as a single squashed commit into your main branch?

@github We discussed this and it would violate too many of our internal models unfortunately. Merging multiple PRs into one commit would cause issues with reverting PRs and associating approvals/rule evals to merge commits


