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 pkg/cmd/cli.go
CONFLICT (modify/delete): pkg/cmd/dashboard/dashboard.go deleted in c52e7d1 (chore: delete dashboard cmd (#574)) and modified in HEAD. Version HEAD of pkg/cmd/dashboard/dashboard.go left in tree.
CONFLICT (modify/delete): pkg/cmd/dashboard/dashboard_test.go deleted in c52e7d1 (chore: delete dashboard cmd (#574)) and modified in HEAD. Version HEAD of pkg/cmd/dashboard/dashboard_test.go left in tree.
CONFLICT (modify/delete): pkg/cmd/dashboard/grafana_direct.go deleted in c52e7d1 (chore: delete dashboard cmd (#574)) and modified in HEAD. Version HEAD of pkg/cmd/dashboard/grafana_direct.go left in tree.
CONFLICT (modify/delete): pkg/cmd/dashboard/grafana_direct_test.go deleted in c52e7d1 (chore: delete dashboard cmd (#574)) and modified in HEAD. Version HEAD of pkg/cmd/dashboard/grafana_direct_test.go left in tree.
CONFLICT (modify/delete): pkg/cmd/dashboard/suite_test.go deleted in c52e7d1 (chore: delete dashboard cmd (#574)) and modified in HEAD. Version HEAD of pkg/cmd/dashboard/suite_test.go left in tree.
error: could not apply c52e7d1... chore: delete dashboard cmd (#574)
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 advice.mergeConflict false"
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.
yipeng1030
requested review from
nayutah,
ldming,
heng4fun,
wangyelei,
leon-inf and
1aal
as code owners
No description provided.