Repository navigation
feat(conflicts): add verified three-way editor - #85
Merged
Merged
Conversation
🚀 Deploying Preview to Cloudflare 🚀Preview Deployments by commit
|
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
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.
V12-05 Conflict Editor feature on top of the integrated Rebase workflow.
The app opens supported UTF-8 stage 1/2/3 text conflicts from Changes and shows verified BASE, OURS, THEIRS and editable RESULT panels. Save atomically updates only the working file and leaves the index untouched; Mark resolved revalidates the full snapshot and installs only the confirmed stage-0 entry. Merge, Rebase, Cherry-pick and Revert provenance use operation metadata and real parent objects. Unsupported drivers/filters, binary or invalid UTF-8 content, symlinks, unsupported index formats, external edits and replacement parents are rejected.
Local validation:
docs/acceptance/2026-10-31/conflict-editor/.Trusted entry PR #84 and Rebase PR #80 are now integrated in main. This PR requires new head-specific Core, native and performance CI and the fixed
conflict-editorsmoke+focused native run before integration. PR remains draft pending those results. V12-07/08/09 and final v1.2 gates remain open.Closes #81