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
#3461 failed to apply on top of branch "release-3.3":
Applying: Update UI text
Using index info to reconstruct a base tree...
M locales/en/l10n-clusterManagement-applicationWorkloads-deployments-list.js
M locales/en/l10n-projects-applicationWorkloads-apps-templateBasedApps-details.js
A src/components/Tables/Base/Pagination/index.jsx
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/components/Tables/Base/Pagination/index.jsx deleted in HEAD and modified in Update UI text. Version Update UI text of src/components/Tables/Base/Pagination/index.jsx left in tree.
Auto-merging locales/en/l10n-projects-applicationWorkloads-apps-templateBasedApps-details.js
CONFLICT (content): Merge conflict in locales/en/l10n-projects-applicationWorkloads-apps-templateBasedApps-details.js
Auto-merging locales/en/l10n-clusterManagement-applicationWorkloads-deployments-list.js
CONFLICT (content): Merge conflict in locales/en/l10n-clusterManagement-applicationWorkloads-deployments-list.js
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Update UI text
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
The text was updated successfully, but these errors were encountered:
Manual cherrypick required.
#3461 failed to apply on top of branch "release-3.3":
The text was updated successfully, but these errors were encountered: