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
#16747 failed to apply on top of branch "release-1.23":
Applying: Fix broken links
Using index info to reconstruct a base tree...
M layouts/_default/baseof.html
Falling back to patching base and 3-way merge...
Auto-merging layouts/_default/baseof.html
CONFLICT (content): Merge conflict in layouts/_default/baseof.html
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 broken links