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-1.27] Update kubectl verion to v1.27.16 #23

Open
ks-ci-bot opened this issue Jul 29, 2024 · 0 comments
Open

[release-1.27] Update kubectl verion to v1.27.16 #23

ks-ci-bot opened this issue Jul 29, 2024 · 0 comments

Comments

@ks-ci-bot
Copy link

Manual cherrypick required.

#22 failed to apply on top of branch "release-1.27":

Applying: Update Dockerfile
Applying: update kubectl verion to v1.27.16
Using index info to reconstruct a base tree...
M	Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging Dockerfile
CONFLICT (content): Merge conflict in Dockerfile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 update kubectl verion to v1.27.16
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

1 participant