Hi there, Can we use stacking and the merge all if...
# how-do-i
m
Hi there, Can we use stacking and the merge all if we dont use graphite merge queue? Was looking at the plans and looks thats not part of the starter plan.
p
(If applicable) To help us more clearly understand what you're trying to do, please provide additional details about: - Screenshots / debug logs / list of commands you've tried to run so far - Your workflow - Current state
hey Mez, yes the regular stack merge functionality does not require using a merge queue
l
what's the point of the merge queue then?
p
there's specific situations and benefits it can provide beyond the regular stack merge functionality. We detail this here
l
bit of feedback: people seem to think the merge queue is critical infra for stacked diffs and it feels like tablestakes, but not in a way where you're excited about upgrading, more feeling overly limited by the base tier
👀 1
✅ 1
p
gotcha, will surface this feedback to the team that we should indicate the Stack Merge functionality is included across the plans
👍 1
m
Whats the effect of not using the merge queue when I merge stack? As they could be handled in parallel by Github right? Whats the expectation if • I merge a stack • someone else merges single PR Its just a race? Will the stack be rebased automatically between merges? will I be manually rebasing all the time? I can test this too but hoping you guys already know this. If I use github merge queue I mostly lose out on the below right?
The Graphite Merge Queue is stack-aware, providing opportunities for faster concurrent/batched merges and optimizing the order in which PRs are merged. So if the stack is added to the queue together, the merge queue can process and validate the entire stack in parallel. No need for CI to run again since we have already validated the CI against that exact change (this is also known as fast-forward merge, as described below).
p
Will the stack be rebased automatically between merges? will I be manually rebasing all the time?
Automatic rebasing will be attempted so long as you click
merge
from the Graphite app. This feature does not work when merging from GitHub. With the regular Stack Merge, It is still possible to manually merge an individual PR or stack of PRs in GitHub, however this will require manually syncing and submitting after each PR merges to ensure the stack is rebased and Graphite is aware of the new state. More information on manual merging here.
If I use github merge queue I mostly lose out on the below right
Yes, unlike Graphite’s merge queue, external merge queues don’t use stack context to optimize merges, so you won’t benefit from the same performance boosts and guarantees available with the Graphite merge queue. More information about the limitations here.