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
#15874 failed to apply on top of branch "release-1.23":
Applying: Fix the blog link typo in 1.24 announcement
Using index info to reconstruct a base tree...
A content/en/news/releases/1.24.x/announcing-1.24/_index.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): content/en/news/releases/1.24.x/announcing-1.24/_index.md deleted in HEAD and modified in Fix the blog link typo in 1.24 announcement. Version Fix the blog link typo in 1.24 announcement of content/en/news/releases/1.24.x/announcing-1.24/_index.md left in tree.
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 Fix the blog link typo in 1.24 announcement
The text was updated successfully, but these errors were encountered:
Manual cherrypick required.
#15874 failed to apply on top of branch "release-1.23":
The text was updated successfully, but these errors were encountered: