docs: update content #1424
Merged
docs: update content #1424
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. |
thinkasany
reviewed
Nov 7, 2025
guide/features.md
Outdated
| ## 构建优化 {#build-optimizations} | ||
| ======= | ||
| ## License | ||
| ## 许可证信息 {#license} |
Collaborator
There was a problem hiding this comment.
这个不用翻译吧，license 挺规范的常见专有名词
thinkasany
reviewed
Nov 7, 2025
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR resolves merge conflicts in Chinese documentation files by removing Git conflict markers and keeping the Chinese translations. The changes affect documentation files that were in conflict between the main branch (Chinese version) and an incoming branch (English version).
- All Git conflict markers (
<<<<<<<,=======,>>>>>>>) have been removed - Chinese translations are consistently preserved throughout
- English text from the conflicting branch has been properly replaced
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| releases.md | Removed conflict markers and kept Chinese text for supported version ranges |
| guide/static-deploy.md | Resolved conflicts in GitHub Pages deployment section, maintaining Chinese translations with proper formatting |
| guide/features.md | Resolved conflicts around License section, keeping Chinese translation and proper heading order |
| config/build-options.md | Resolved conflicts in build.license documentation, maintaining Chinese translation |
| .vitepress/config.ts | Resolved conflicts in config settings, keeping Chinese title and description |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
thinkasany
approved these changes
Nov 7, 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.