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

Error cherry-picking PR #4263 #4280

Closed
sealos-ci-robot opened this issue Nov 9, 2023 · 0 comments
Closed

Error cherry-picking PR #4263 #4280

sealos-ci-robot opened this issue Nov 9, 2023 · 0 comments
Assignees

Comments

@sealos-ci-robot
Copy link
Member

Error cherry-picking PR #4263 into release-v4.4:

Auto-merging go.mod
Auto-merging go.sum
Auto-merging go.work.sum
CONFLICT (content): Merge conflict in go.work.sum
Auto-merging test/e2e/go.mod
CONFLICT (content): Merge conflict in test/e2e/go.mod
Auto-merging test/e2e/go.sum
CONFLICT (content): Merge conflict in test/e2e/go.sum
error: could not apply f21b7c9... docs: upgrade sreg gomod (#4263)
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".

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