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 cmd/sealos/cmd/gen.go
Auto-merging pkg/apply/gen.go
Auto-merging pkg/clusterfile/clusterfile.go
CONFLICT (content): Merge conflict in pkg/clusterfile/clusterfile.go
Auto-merging pkg/clusterfile/pre_process.go
CONFLICT (content): Merge conflict in pkg/clusterfile/pre_process.go
error: could not apply 0230455... fix: make the usage of '--env' flag more precisely (#4060) (#4063)
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 #4063 into release-v4.3:
Auto-merging cmd/sealos/cmd/gen.go
Auto-merging pkg/apply/gen.go
Auto-merging pkg/clusterfile/clusterfile.go
CONFLICT (content): Merge conflict in pkg/clusterfile/clusterfile.go
Auto-merging pkg/clusterfile/pre_process.go
CONFLICT (content): Merge conflict in pkg/clusterfile/pre_process.go
error: could not apply 0230455... fix: make the usage of '--env' flag more precisely (#4060) (#4063)
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: