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
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"
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"
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
shanshanying
requested review from
1aal,
heng4fun,
ldming,
leon-inf,
nayutah and
wangyelei
as code owners
inherit from KubeBlocks, but not applicable for kbcli.