From aff3f94a7ed1f7727c8f5be69365dd532799de73 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Fri, 23 Oct 2026 11:01:59 -0700 Subject: [PATCH 1/2] quest: plan adopting the quest merge driver Co-Authored-By: Claude Opus 5.5 --- quest/m0/README.md | 1 + quest/m0/quest-resolve.md | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 quest/m0/quest-resolve.md diff --git a/quest/m0/README.md b/quest/m0/README.md index f72452dfc72..5257031009a 100644 --- a/quest/m0/README.md +++ b/quest/m0/README.md @@ -45,5 +45,6 @@ Each lands its fixes in its own PR and plans only what needs a decision. - [qmux 0.5.3](/quest/m0/qmux-0.5.3.md) - crates.io publishes qmux 0.5.3 with the builder session config the release backport of #5609 needs - [Release shutdown backport](/quest/m0/ffi-shutdown-backport.md) - `release` publishes a non-breaking moq-ffi with an async `drain()` and qmux sessions on the QUIC stream limit - [Release fixed delay](/quest/m0/release-fixed-delay.md) - a fixed latency on `release`, which moq.dev runs, ignores the catalog's jitter and delay as `main` already does +- [Adopt quest resolve](/quest/m0/quest-resolve.md) - local merges resolve concurrent quest link-list edits once kixelated/quest ships its merge driver - [CI cost and latency](/quest/m0/ci/README.md) - cloud CI runs only in the merge queue as one `just ci` pass, expensive checks run nightly and gate `release`, caches move to R2, and runners are chosen last - [MIGRATE.md at the cut](/quest/m0/migrate-at-cut.md) - PRs stop conflicting on `MIGRATE.md`: breaking PRs carry their migration note in the PR, and the breaking cut writes the guides diff --git a/quest/m0/quest-resolve.md b/quest/m0/quest-resolve.md new file mode 100644 index 00000000000..f94f2dd1714 --- /dev/null +++ b/quest/m0/quest-resolve.md @@ -0,0 +1,20 @@ +# [XS] Adopt the quest merge driver + +## Goal + +Local merges in this repository resolve concurrent quest link-list edits +without conflict markers. Waits on kixelated/quest shipping `quest resolve`, +planned in [kixelated/quest#199](https://github.com/kixelated/quest/pull/199): +check whether `quest resolve --help` works on kixelated/quest `main`. + +## Plan + +Decided 2026-10-23 (maintainer), from a replay of 280 merges of `main` into +PR branches: 29 of 128 conflicted merges conflicted only in quest files, +mostly `quest/m1/README.md`'s Required list. Git's `merge=union` was rejected +because it resurrects lines for quests `main` had deleted. + +Bump the `quest` input in `flake.nix` to a revision with `quest resolve`, then +run `quest init` and commit the `.gitattributes` line it writes. GitHub's own +merges ignore drivers, so a PR still shows as conflicting until a local merge +from `main` is pushed; that merge then resolves itself. From 8ff0331dd485e90e82ae86f10ceade4697298a78 Mon Sep 17 00:00:00 2001 From: Luke Curley Date: Fri, 23 Oct 2026 11:07:49 -0700 Subject: [PATCH 2/2] quest: note how other clones register the driver Co-Authored-By: Claude Opus 5.5 --- quest/m0/quest-resolve.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/quest/m0/quest-resolve.md b/quest/m0/quest-resolve.md index f94f2dd1714..aa51b0f83bb 100644 --- a/quest/m0/quest-resolve.md +++ b/quest/m0/quest-resolve.md @@ -15,6 +15,8 @@ mostly `quest/m1/README.md`'s Required list. Git's `merge=union` was rejected because it resurrects lines for quests `main` had deleted. Bump the `quest` input in `flake.nix` to a revision with `quest resolve`, then -run `quest init` and commit the `.gitattributes` line it writes. GitHub's own +run `quest init` and commit the `.gitattributes` line it writes. Other clones +need no setup: any `quest` command registers `merge.quest.driver` in a clone +whose `.gitattributes` names it, and the dev shell puts `quest` on PATH. GitHub's own merges ignore drivers, so a PR still shows as conflicting until a local merge from `main` is pushed; that merge then resolves itself.