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 cherry pick PR 3051 from ty-dc, to branch release-v0.7 #3074

Closed
weizhoublue opened this issue Jan 11, 2024 · 1 comment
Closed
Assignees

Comments

@weizhoublue
Copy link
Collaborator

commits 1b3effd of ty-dc conflict when merging to branch release-v0.7, please manually cherry pick it by yourself.
PR #3051 , action https://github.com/spidernet-io/spiderpool/actions/runs/7486616348

Auto-merging .github/workflows/auto-cherrypick.yaml
CONFLICT (content): Merge conflict in .github/workflows/auto-cherrypick.yaml
Auto-merging .github/workflows/call-release-chart.yaml
Auto-merging .github/workflows/call-release-doc.yaml
Auto-merging .github/workflows/call-update-githubpages.yaml
error: could not apply 1b3effd9... Merge pull request #3051 from ty-dc/action/sign-license
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".
@ty-dc
Copy link
Collaborator

ty-dc commented Jan 11, 2024

fix #3077

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

3 participants