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

[release-1.14] Improve istioctl options command description #40587

Closed
istio-testing opened this issue Aug 22, 2022 · 1 comment
Closed

[release-1.14] Improve istioctl options command description #40587

istio-testing opened this issue Aug 22, 2022 · 1 comment
Assignees

Comments

@istio-testing
Copy link
Collaborator

Manual cherrypick required.

#38236 failed to apply on top of branch "release-1.14":

Applying: improve description
Applying: revise and add releasenotes
Applying: revise run to runE
Applying: lint
Using index info to reconstruct a base tree...
M	istioctl/cmd/root.go
Falling back to patching base and 3-way merge...
Auto-merging istioctl/cmd/root.go
CONFLICT (content): Merge conflict in istioctl/cmd/root.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 lint
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

@howardjohn
Copy link
Member

#40967

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants