Rebase conflict: ht on master (2026-06-28)

[marksverdhai]

Rebase Conflict: ht on master

The automated rebase of ht onto the latest master (synced from ggml-org/llama.cpp) failed due to conflicts.

Conflicting Files

CONFLICT (content): Merge conflict in tests/test-backend-ops.cpp

Manual Resolution Steps

git fetch origin
git checkout ht
git rebase origin/master
# Resolve conflicts...
git rebase --continue
git push --force-with-lease origin ht

Workflow Run

28316583054

---

Automated by fork-sync workflow

[marksverdhei]

Triage: scope is larger than the single file reported, and a naive rebase is the wrong method for ht

Measured against origin/ht and origin/master today (2026-07-02):

• Delta from merge-base c299a92c3: master +35 commits, ht +37 commits. Routine size, but not mechanical.
• A fresh git rebase origin/master (the steps in this issue) stops at the very first ht commit — 5b7a1e0a3 chore(ht): fork infrastructure — build, CI, branding, drop embedded webui source — with 10 conflicts, dominated by tools/ui/* (Svelte chat components, PWA, sources.cmake) plus a fork-specific common/common.h (DFlash speculative-type enum). These arise because ht drops/rewrites the embedded webui while upstream keeps evolving it.
• The tests/test-backend-ops.cpp conflict this issue reports is a later stop — ht's TurboQ TBQ3_0/TBQ4_0 test cases vs. upstream's CUDA test changes (931eb37f8, 0ed235ea2); additive and resolvable. The automated workflow surfaced only that one file, which understates the real first-conflict scope.

Recommendation

This is the periodic deliberate ht↔upstream sync, not a quick conflict-fix. Prior ht syncs were not done as rebase origin/master + push --force-with-lease — a naive rebase re-breaks the webui (regressed clicks on 2026-05-12), and ht's history has been reconstructed per-feature with a tree-identical assertion + rollback tag (see the 2026-06-13 114-commit sync). So the manual steps in this issue aren't the method that's worked for ht.

Suggested path when scheduled:

1. Reconstruct the net fork-diff onto origin/master, regrouped per feature (webui-infra, TurboQ, DFlash, MTP, router-fit, mtmd) rather than replaying the fork-infra commit into upstream webui churn.
2. cmake build llama-server + ctest + a Tauri-shell webui smoke test before pushing.
3. Cut a rollback tag, then --force-with-lease ht.

Force-pushing the default branch is Markus's call — flagging scope so it can be scheduled; not executing autonomously. (Trial rebase was run in a throwaway worktree and aborted; origin/ht untouched.)

Meta: the fork-sync workflow reports a single conflicting file, which misrepresents these syncs as one-file fixes. Worth having it either report the full conflict set or link to the reconstruct runbook.