Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

failed to auto cherry pick PR 226 to branch release-v0.2 #229

Closed
weizhoublue opened this issue Sep 26, 2023 · 0 comments
Closed

failed to auto cherry pick PR 226 to branch release-v0.2 #229

weizhoublue opened this issue Sep 26, 2023 · 0 comments
Assignees

Comments

@weizhoublue
Copy link
Collaborator

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

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".
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants