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
This file contains 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
Auto-merging apis/apps/v1alpha1/cluster_types.go
CONFLICT (content): Merge conflict in apis/apps/v1alpha1/cluster_types.go
Auto-merging apis/apps/v1alpha1/component_types.go
CONFLICT (content): Merge conflict in apis/apps/v1alpha1/component_types.go
Auto-merging apis/apps/v1alpha1/opsrequest_types.go
Auto-merging apis/apps/v1alpha1/zz_generated.deepcopy.go
CONFLICT (content): Merge conflict in apis/apps/v1alpha1/zz_generated.deepcopy.go
Auto-merging config/crd/bases/apps.kubeblocks.io_clusters.yaml
CONFLICT (content): Merge conflict in config/crd/bases/apps.kubeblocks.io_clusters.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_components.yaml
CONFLICT (content): Merge conflict in config/crd/bases/apps.kubeblocks.io_components.yaml
Auto-merging config/crd/bases/apps.kubeblocks.io_opsrequests.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_clusters.yaml
CONFLICT (content): Merge conflict in deploy/helm/crds/apps.kubeblocks.io_clusters.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_components.yaml
CONFLICT (content): Merge conflict in deploy/helm/crds/apps.kubeblocks.io_components.yaml
Auto-merging deploy/helm/crds/apps.kubeblocks.io_opsrequests.yaml
Auto-merging docs/developer_docs/api-reference/cluster.md
CONFLICT (content): Merge conflict in docs/developer_docs/api-reference/cluster.md
error: could not apply a89c4b2... chore: improve api-doc
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".
approvedPR Approved Testsize/XXLDenotes a PR that changes 1000+ lines.
4 participants
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.
weicao
requested review from
nayutah,
ldming,
heng4fun,
free6om,
wangyelei and
Y-Rookie
as code owners
No description provided.