feat(editor): R-00363 M6-D rebase, conflict panel, and three-way merge - #13
Merged
Conversation
added 2 commits
September 2, 2026 18:29
Session.rebase_draft calls patch.merge_cell against a frozen sourceFingerprint snapshot, then POST /api/drafts/{t}/rebase advances draftVersion. Auto-merge remounts warehouse as baseline so submit keeps both sides; same-cell STALE_BASELINE opens ConflictPanel without a force-overwrite action.
Return auto-merged sibling cells when one cell conflicts, keep dirty from tearing down Conflicted, allow panel writes through interceptors, filter SSE by table, and detect SCHEMA_CHANGED from the draft schema fingerprint after Host restart.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
R-00363 M6-D rebase / ConflictPanel
Implements Host
POST /api/drafts/{t}/rebaseand the editor ConflictPanel.Session.rebase_draftcallspatch.merge_cellagainst a frozensourceFingerprintsnapshot. Does not changepatch.pymerge semantics.Acceptance
different cell auto-merges and submit keeps both sides).same cell opens the conflict panel).DELETED_ROW_CONFLICTwith 放弃我的改动 / 取消提交; rename still locates by stable id (Python tests).SCHEMA_CHANGEDonly allows 刷新重放, including after Host restart via draftschemaFingerprint. Successful rebase advancesbaseFingerprintand incrementsdraftVersion.Closeout
python -m unittest discover -s tests: 122 OK (1 skipped)python tools/lumio_config.py validate/format --check: OKgit diff --check: OKpnpm lint/pnpm test: 37pnpm build+pnpm e2e: 24 passedDo not merge until evaluator-authorized dispatcher merge.