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.

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

[release-3.3] docs: Update UI text #3504

Closed
ks-ci-bot opened this issue Aug 1, 2022 · 0 comments
Closed

[release-3.3] docs: Update UI text #3504

ks-ci-bot opened this issue Aug 1, 2022 · 0 comments
Assignees

Comments

@ks-ci-bot
Copy link
Collaborator

Manual cherrypick required.

#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".

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants