Slackbot
01/12/2024, 7:06 PMAryaman
01/12/2024, 7:11 PMAryaman
01/12/2024, 7:12 PMgt move to move one on top of the other (eg. A -> B -> C -> DAryaman
01/12/2024, 7:13 PMSamuel Stancl
01/12/2024, 7:40 PMmain -> A -> B -> C -> D
(based on B) -> E -> F
In this case the two stacks would be independent, with E (and anything upstack) being based on B.
Meaning, the E stack would be mergeable once B has made it into main.Samuel Stancl
01/12/2024, 7:41 PME stack can now point to main. What would be the steps to take there to make that change?Samuel Stancl
01/12/2024, 7:46 PMAryaman
01/12/2024, 8:06 PMSay that from the first stack, I merge PRs up until B, so thestack can now point to main. What would be the steps to take there to make that change?E
gt sync -f --restack should handle this for youAryaman
01/12/2024, 8:06 PM(Essentially meaning that branches in a stack don't have to be based on the newest branch, and can be based on some branch in the middle of the stack)Yes this is possible
Aryaman
01/12/2024, 8:07 PME stack can now point to main. What would be the steps to take there to make that change?
You can create this through your normal flow. You can create A -> B -> C ->D. Then gt checkout B and then create E -> F. Merging and restack is handled by gt sync and gt restackSamuel Stancl
01/12/2024, 10:13 PM