Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion quest/m0/helpers/queue-siblings.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@

Several PRs that each finish a child of the same epic land back to back
through a server-side merge, such as a GitHub merge queue, without each
landing knocking the next one out on a conflict in the epic's link list.
landing knocking the next one out on a conflict in the epic's link list, or
on a `quest check` failure over a quest the base just finished.

## Plan

Expand All @@ -15,6 +16,13 @@ GitHub's merge queue builds its merge commit without it. Each landing
conflicted with the next queued sibling, which cost four extra
drop, merge, and re-land cycles in one batch.

A second symptom: a quest-only PR waiting in the queue fails `quest check`
once main finishes a quest it links. moq-dev/moq#6707 was dropped 3 times
and moq-dev/moq#6790 4 times. Options: run `quest check` against current
main before queueing, or have the check treat a link to a deleted quest as
resolvable. A pre-queue check alone misses a base that moves after queueing,
and a tolerant check must tell a finished quest from a mistyped link.

The fix belongs in quest, not in each repository's process. Rejected:
landing one sibling at a time, which serializes batches.

Expand Down
Loading