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 #4023 #4027

Closed
sealos-ci-robot opened this issue Oct 7, 2023 · 0 comments · Fixed by #4028
Closed

Error cherry-picking PR #4023 #4027

sealos-ci-robot opened this issue Oct 7, 2023 · 0 comments · Fixed by #4028
Assignees

Comments

@sealos-ci-robot
Copy link
Member

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

Auto-merging docs/4.0/docs/lifecycle-management/operations/build-image/build-image-image_list.md
CONFLICT (content): Merge conflict in docs/4.0/docs/lifecycle-management/operations/build-image/build-image-image_list.md
Auto-merging docs/4.0/docs/lifecycle-management/reference/sealos/commands/build.md
CONFLICT (content): Merge conflict in docs/4.0/docs/lifecycle-management/reference/sealos/commands/build.md
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.work.sum
CONFLICT (content): Merge conflict in go.work.sum
error: could not apply 3c8c639... feature(main): using sreg 0.1.4 build image (#4023)
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

Successfully merging a pull request may close this issue.

2 participants