DL-617

Saiph merge-queue auto-rebase is Rebase with drop_empty; the queue fixes only trunk conflicts, with a deterministic classifier first and then one chat-completion call whose answer may only choose lines the two sides wrote, written by Rebase with resolutions and uploaded as a CONFLICT_FIX version that passes the same CI.

Status: Active (design, 2026-10-19)