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.1] fix: resourceStatus get podNums #4289

Open
ks-ci-bot opened this issue Sep 14, 2024 · 0 comments
Open

[release-3.1] fix: resourceStatus get podNums #4289

ks-ci-bot opened this issue Sep 14, 2024 · 0 comments
Assignees

Comments

@ks-ci-bot
Copy link
Collaborator

Manual cherrypick required.

#4280 failed to apply on top of branch "release-3.1":

Applying: fix: resourceStatus get podNums
Using index info to reconstruct a base tree...
M	src/pages/projects/containers/Deployments/Detail/ResourceStatus/index.jsx
M	yarn.lock
Falling back to patching base and 3-way merge...
Auto-merging yarn.lock
CONFLICT (content): Merge conflict in yarn.lock
Auto-merging src/pages/projects/containers/Deployments/Detail/ResourceStatus/index.jsx
CONFLICT (content): Merge conflict in src/pages/projects/containers/Deployments/Detail/ResourceStatus/index.jsx
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: resourceStatus get podNums
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