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 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".
The text was updated successfully, but these errors were encountered:
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".
The text was updated successfully, but these errors were encountered: