Is there a way to merge everything within a stack up to a sp Graphite Community #how-do-i

Is there a way to merge everything, within a stack...

Dimitris

10/23/2023, 11:16 AM

Is there a way to merge everything, within a stack, up to a specific PR? we are in a situation where we would like to merge everything that is on the stack on PR 1/X, before we finally merge 1/X (which now would be 1/1 since everything else would be merged on it) on trunk. so, is there a way to do that?

Dimitris

10/23/2023, 11:24 AM

My guess would be to do

gt fold

on all the prs one by one, until it's only 1/1 left?

Pranathi Peri

10/23/2023, 8:29 PM

Yeah that seems like the right solution!

❤️ 1

Dimitris

10/24/2023, 12:00 PM

hey @Pranathi Peri,so I folded everything on the 1st branch of the stack, my local stack shows as just 2 branches (the trunk and the 1 branch that now holds everything) however after

gt ss

my local (updated) stack, I am not asked to delete the branches that got merged, on the remote side of things. The graphite UI still shows a 25 branch stack, but the stack now only has 1. How can I bring the remote to reflect my current local stack? Thanks

Dimitris

10/24/2023, 12:37 PM

For the record, I would have expected that

gt fold

would take care to delete the branch that got folded onto its parent, since it is no longer needed, and that graphite could track this and delete the branch from remote as well when

gt sync

is run again. Or at least be able to pass an argument such as

-D

gt fold

in order to delete the branch as well, if you do not want to do a destructive action by default

Open in Slack

Previous Next