正在加载视频...

视频加载失败

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 次观看 • 24 天前 •via X (Twitter)

16 条评论

erKam 🅰️ 的头像
erKam 🅰️24 天前

@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

John Rees 的头像
John Rees23 天前

@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?

Andrew Babbitt 的头像
Andrew Babbitt23 天前

@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?

Kizuno18 的头像
Kizuno1824 天前

@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

Amit Ghadge 的头像
Amit Ghadge23 天前

@github Manually resolve conflicts.

Sameen Karim 的头像
Sameen Karim23 天前

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

FrançaisFaché 的头像
FrançaisFaché23 天前

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

Shekhar Palit 🇺🇸 的头像
Shekhar Palit 🇺🇸23 天前

@github Please fix the CI bottleneck

Batuhan Cakir 的头像
Batuhan Cakir23 天前

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

Sameen Karim 的头像
Sameen Karim23 天前

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

Batuhan Cakir 的头像
Batuhan Cakir23 天前

@github oh that sounds really nice

Sudara Fernando 的头像
Sudara Fernando23 天前

@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

Sameen Karim 的头像
Sameen Karim23 天前

@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

Matthew 的头像
Matthew24 天前

@github Yes!!!!

John Barker 的头像
John Barker23 天前

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

Sameen Karim 的头像
Sameen Karim23 天前

@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

相关视频