docs: update content #1404
Merged
docs: update content #1404
+17
−29
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
|
@lxKylin is attempting to deploy a commit to the vuejs Team on Vercel. A member of the Team first needs to authorize it. |
There was a problem hiding this comment.
Pull Request Overview
This PR resolves merge conflicts in documentation files by cleaning up Git conflict markers and consolidating the content into a single, coherent version.
Key changes:
- Removed Git merge conflict markers (<<<<<<< HEAD, =======, >>>>>>>) from two documentation files
- Consolidated Chinese translations with proper ordering and formatting
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| guide/api-environment-runtimes.md | Removed merge conflict markers and properly ordered Chinese translation content about client connect/disconnect events |
| guide/api-environment-plugins.md | Resolved extensive merge conflicts in the plugin communication section, integrating translated content about application-plugin communication |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
thinkasany
approved these changes
Oct 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.