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 #4063 #4064

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

Error cherry-picking PR #4063 #4064

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

Comments

@sealos-ci-robot
Copy link
Member

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".

@cuisongliu cuisongliu linked a pull request Oct 11, 2023 that will close this issue
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