Resolve merge conflicts: bring working-Annotation-Generator up to date with main - #46
Draft
saoshreyas with Copilot wants to merge 2 commits into
Draft
Resolve merge conflicts: bring working-Annotation-Generator up to date with main#46saoshreyas with Copilot wants to merge 2 commits into
saoshreyas with Copilot wants to merge 2 commits into
Conversation
…e with main Agent-Logs-Url: https://github.com/elmisback/magic-markup/sessions/28aea4c4-7492-4b6e-a108-2163f3ded25c Co-authored-by: saoshreyas <112500727+saoshreyas@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Update working branch with latest changes from main
Resolve merge conflicts: bring working-Annotation-Generator up to date with main
Apr 20, 2026
Owner
|
This branch is not ready to merge into main, please do not merge it. See the comments I made in #35 (comment). Most importantly, merging this branch should not add length or modify much code in |
github-project-automation
Bot
moved this from Done
to In Progress
in Codetations development
Owner
|
@saoshreyas you can try telling copilot to resolve the PR but you probably need to have it follow the instructions above |
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.
working-Annotation-Generatorhad three conflicted files when merging withmain, primarily due to a Vite version mismatch (2.9 → 6.4) and the workaround that was added for it.Changes
webview-ui/src/tools.tsx: RemovedSimpleMarkdown— a hand-rolled markdown renderer added as a workaround for Vite 2.9's inability to handlereact-markdownv9 (ESM-only). Replaced its single usage with<ReactMarkdown>now that Vite 6 handles ESM properly.webview-ui/package.json: Resolved version conflict by keepingtypescript ^5.9.3(working branch, newer) andvite ^6.4.1(main, newer).package-lock.json: Accepted main's lock file reflecting the updated dependency tree.