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
Auto-merging pkg/pluginManager/agentTools.go
CONFLICT (content): Merge conflict in pkg/pluginManager/agentTools.go
Auto-merging pkg/pluginManager/apphttphealthy/agentExecuteTask.go
CONFLICT (content): Merge conflict in pkg/pluginManager/apphttphealthy/agentExecuteTask.go
Auto-merging pkg/pluginManager/netdns/agentExecuteTask.go
CONFLICT (content): Merge conflict in pkg/pluginManager/netdns/agentExecuteTask.go
Auto-merging pkg/pluginManager/netreach/agentExecuteTask.go
CONFLICT (content): Merge conflict in pkg/pluginManager/netreach/agentExecuteTask.go
CONFLICT (modify/delete): pkg/resource/resource.go deleted in HEAD and modified in 54c4bbe (Merge pull request #226 from kdoctor-io/pr/ii2day/stats). Version 54c4bbe (Merge pull request #226 from kdoctor-io/pr/ii2day/stats) of pkg/resource/resource.go left in tree.
error: could not apply 54c4bbe... Merge pull request #226 from kdoctor-io/pr/ii2day/stats
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", 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".
The text was updated successfully, but these errors were encountered:
commits 54c4bbe conflict when merging to branch release-v0.2, please manually cherry pick it by yourself.
PR #226 , action https://github.com/kdoctor-io/kdoctor/actions/runs/6315297434
The text was updated successfully, but these errors were encountered: