Skip to content
Merged
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions quest/m0/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
22 changes: 22 additions & 0 deletions quest/m0/quest-resolve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# [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. 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.
Loading