Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[zh] Sync #15897 1.24.0 release note updates into Chinese #15903

Merged
merged 1 commit into from
Nov 8, 2024
Merged

[zh] Sync #15897 1.24.0 release note updates into Chinese #15903

merged 1 commit into from
Nov 8, 2024

Conversation

wilsonwu
Copy link
Member

@wilsonwu wilsonwu commented Nov 8, 2024

Description

Sync #15897 1.24.0 release note updates into Chinese

Reviewers

  • Ambient
  • Docs
  • Installation
  • Networking
  • Performance and Scalability
  • Extensions and Telemetry
  • Security
  • Test and Release
  • User Experience
  • Developer Infrastructure
  • Localization/Translation

@wilsonwu wilsonwu added the translation/chinese Translation item label Nov 8, 2024
@wilsonwu wilsonwu requested a review from a team as a code owner November 8, 2024 08:19
@istio-testing istio-testing added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 8, 2024
@istio-testing istio-testing merged commit 2e63b38 into istio:master Nov 8, 2024
6 checks passed
@wilsonwu wilsonwu added the cherrypick/release-1.24 Set this label on a PR to auto-merge it to the release-1.24 branch label Nov 8, 2024
@istio-testing
Copy link
Contributor

In response to a cherrypick label: #15903 failed to apply on top of branch "release-1.24":

Applying: Sync #15897 1.24.0 release note updates into Chinese
Using index info to reconstruct a base tree...
M	content/zh/news/releases/1.24.x/announcing-1.24/_index.md
A	content/zh/news/releases/1.24.x/announcing-1.24/change-notes/index.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): content/zh/news/releases/1.24.x/announcing-1.24/change-notes/index.md deleted in HEAD and modified in Sync #15897 1.24.0 release note updates into Chinese. Version Sync #15897 1.24.0 release note updates into Chinese of content/zh/news/releases/1.24.x/announcing-1.24/change-notes/index.md left in tree.
Auto-merging content/zh/news/releases/1.24.x/announcing-1.24/_index.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Sync #15897 1.24.0 release note updates into Chinese

@istio-testing
Copy link
Contributor

In response to a cherrypick label: new issue created for failed cherrypick: #15906

@istio-testing istio-testing mentioned this pull request Nov 8, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@windsonsea windsonsea windsonsea approved these changes

Assignees
No one assigned
Labels
cherrypick/release-1.24 Set this label on a PR to auto-merge it to the release-1.24 branch kind/docs size/S Denotes a PR that changes 10-29 lines, ignoring generated files. translation/chinese Translation item
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@wilsonwu @istio-testing @windsonsea @istio-policy-bot