the best poor man’s merge stack is
- github merge ...
# how-do-ij
jmoo
10/24/2023, 4:30 PMthe best poor man’s merge stack is
• github merge top branch to main
•
gt sync && gt sr && gt ssa
Aryaman
10/24/2023, 4:47 PM• github merge top branch to mainYou mean github merge bottom branch to main? Also, yes, but Graphite UI merge should handle this for you.
Aryaman
10/24/2023, 4:48 PMYou can do
gt sync -f --restack && gt submit -sj
jmoo
10/24/2023, 4:48 PMah yea bottom branch . whatever is closest to main
👍 1
jmoo
10/24/2023, 4:49 PMyou mean the merge queue feature right?
a
Aryaman
10/24/2023, 4:49 PMNope without MQ. If you go to the top of the stack and hit "Merge x PRs" that should automate this flow for you.
Aryaman
10/24/2023, 4:50 PMThis assumes you aren't using a GitHub / third party merge queue in your repo though
j
jmoo
10/24/2023, 4:50 PMoh whats the difference between the two? i should read up on merge queue
jmoo
10/24/2023, 4:50 PMyea we aren’t — just barebones github repo
a
Aryaman
10/24/2023, 4:50 PMMQ will make sure that all merges in repo are ordered
Aryaman
10/24/2023, 4:50 PMTo avoid semantic conflicts
Aryaman
10/24/2023, 4:51 PMMerging from top of stack as mentioned above just automates the "poor man's merge stack"
j
jmoo
10/24/2023, 4:51 PMoh so merge queue is not necessarily a stack merge, but can work across multiple stacks?
jmoo
10/24/2023, 4:51 PMand the poor man’s thing is already supported out of the box via merge x PRs in the UI
a
Aryaman
10/24/2023, 4:51 PMYup
👍 1
j
jmoo
10/24/2023, 4:56 PMmakes sense! thanks for the clarification
a
Aryaman
10/24/2023, 4:57 PMSee the merge queue docs if you have any questions about what it is for/does
2 Views