Skip to content

Conversation

@shanshanying
Copy link
Contributor

inherit from KubeBlocks, but not applicable for kbcli.

@github-actions github-actions bot added the size/XXL Denotes a PR that changes 1000+ lines. label Nov 19, 2025
@shanshanying shanshanying merged commit 76027ef into main Nov 19, 2025
16 checks passed
@shanshanying shanshanying deleted the support/remove-docker-files branch November 19, 2025 03:24
@shanshanying
Copy link
Contributor Author

/cherry-pick release-0.9

@github-actions github-actions bot added this to the Release 1.0 milestone Nov 19, 2025
@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

CONFLICT (modify/delete): docker/Dockerfile deleted in 76027ef (chore: remove dockerfiles for custom dev container (#642)) and modified in HEAD. Version HEAD of docker/Dockerfile left in tree.
CONFLICT (modify/delete): docker/docker.mk deleted in 76027ef (chore: remove dockerfiles for custom dev container (#642)) and modified in HEAD. Version HEAD of docker/docker.mk left in tree.
error: could not apply 76027ef... chore: remove dockerfiles for custom dev container (#642)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

@apecloud-bot
Copy link
Collaborator

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kbcli/actions/runs/19488675059

@shanshanying
Copy link
Contributor Author

/cherry-pick release-1.0

@apecloud-bot
Copy link
Collaborator

🤖 says: Error cherry-picking.

CONFLICT (modify/delete): docker/docker.mk deleted in 76027ef (chore: remove dockerfiles for custom dev container (#642)) and modified in HEAD. Version HEAD of docker/docker.mk left in tree.
error: could not apply 76027ef... chore: remove dockerfiles for custom dev container (#642)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

@apecloud-bot
Copy link
Collaborator

🤖 says: ‼️ cherry pick action failed.
See: https://github.com/apecloud/kbcli/actions/runs/19488728421

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/XXL Denotes a PR that changes 1000+ lines.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants