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
#4154 failed to apply on top of branch "release-3.4":
Applying: New translations l10n-projects-applicationWorkloads-apps-composedApps-details.js (Korean)
Using index info to reconstruct a base tree...
M locales/ko/l10n-projects-applicationWorkloads-apps-composedApps-details.js
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: New translations l10n-projects-applicationWorkloads-apps-composedApps-list.js (Korean)
Using index info to reconstruct a base tree...
M locales/ko/l10n-projects-applicationWorkloads-apps-composedApps-list.js
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: New translations l10n-projects-applicationWorkloads-services-list.js (Korean)
Using index info to reconstruct a base tree...
M locales/ko/l10n-projects-applicationWorkloads-services-list.js
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: New translations l10n-projects-grayscaleRelease.js (Korean)
Using index info to reconstruct a base tree...
M locales/ko/l10n-projects-grayscaleRelease.js
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: New translations l10n-clusterManagement-clusters.js (Korean)
Using index info to reconstruct a base tree...
M locales/ko/l10n-clusterManagement-clusters.js
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: New translations l10n-devopsProjects-continuousDeployments-list.js (Korean)
Using index info to reconstruct a base tree...
M locales/ko/l10n-devopsProjects-continuousDeployments-list.js
Falling back to patching base and 3-way merge...
Auto-merging locales/ko/l10n-devopsProjects-continuousDeployments-list.js
No changes -- Patch already applied.
Applying: New translations l10n-projects-applicationWorkloads-pods-details.js (Chinese Simplified)
Using index info to reconstruct a base tree...
M locales/zh/l10n-projects-applicationWorkloads-pods-details.js
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: New translations l10n-devopsProjects-continuousDeployments-list.js (Korean)
Using index info to reconstruct a base tree...
M locales/ko/l10n-devopsProjects-continuousDeployments-list.js
Falling back to patching base and 3-way merge...
Auto-merging locales/ko/l10n-devopsProjects-continuousDeployments-list.js
No changes -- Patch already applied.
Applying: New translations l10n-devopsProjects-pipeline-details.js (French)
Using index info to reconstruct a base tree...
M locales/fr/l10n-devopsProjects-pipeline-details.js
Falling back to patching base and 3-way merge...
Auto-merging locales/fr/l10n-devopsProjects-pipeline-details.js
CONFLICT (content): Merge conflict in locales/fr/l10n-devopsProjects-pipeline-details.js
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0009 New translations l10n-devopsProjects-pipeline-details.js (French)
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.
#4154 failed to apply on top of branch "release-3.4":
The text was updated successfully, but these errors were encountered: