You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
#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
The text was updated successfully, but these errors were encountered:
Manual cherrypick required.
#15903 failed to apply on top of branch "release-1.24":
The text was updated successfully, but these errors were encountered: