feat: add Visual Conflict Resolver, Semantic Mermaid Diff, and v1.5.0 updates - #67
Merged
Merged
Conversation
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.
Summary
This PR prepares the v1.5.0 release with major feature additions, documentation improvements, and regression testing updates:
Visual Conflict Resolver (
CustomTextEditorProvider):<<<<<<<,=======,>>>>>>>) directly in rendered Markdown with one-click actions (Accept Mine,Accept Theirs,Accept Both).customEditorsasrich-markdown-diff.conflictResolver.Semantic Mermaid Diff:
Documentation & Release Updates:
CHANGELOG.mdwith concise release notes forv1.5.0.README.mdwith usage instructions for HTML export, committed revision diffs, and a default keyboard shortcuts reference.package.jsonversion to1.5.0.Test Plan
pnpm run test:unit)src/test/unit/conflictParser.test.ts)src/test/unit/mermaidDiff.test.ts)pnpm run pretest)