Resolve main and develop merge conflicts - #8
Merged
Merged
Conversation
* fix: replace retired Marketplace badges * fix: exclude build outputs from VSIX
Owner
Author
|
Closing because repository rules disallow merge commits; squashing this history-only sync would not resolve the develop-to-main conflict. The conflict-resolved branch will instead target main directly. |
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.
Merge the existing main history back into develop so the approved develop-to-main PR can merge cleanly. The two overlapping files retain develop's demo link, demo section, and example-project VSIX exclusion. No version bump or release is included.\n\nVerification: the merge result has no content difference from the current develop tree; required CI must pass before merge.