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.24] fix quote #3390

Open
istio-testing opened this issue Dec 15, 2024 · 0 comments · Fixed by #3391
Open

[release-1.24] fix quote #3390

istio-testing opened this issue Dec 15, 2024 · 0 comments · Fixed by #3391
Assignees

Comments

@istio-testing
Copy link
Collaborator

Manual cherrypick required.

#3359 failed to apply on top of branch "release-1.24":

Applying: fix quote
Using index info to reconstruct a base tree...
M	mesh/v1alpha1/config.pb.go
M	mesh/v1alpha1/config.proto
M	mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
Falling back to patching base and 3-way merge...
Auto-merging mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
CONFLICT (content): Merge conflict in mesh/v1alpha1/istio.mesh.v1alpha1.pb.html
Auto-merging mesh/v1alpha1/config.proto
Auto-merging mesh/v1alpha1/config.pb.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 fix quote

@craigbox craigbox linked a pull request Dec 15, 2024 that will close this issue
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

Successfully merging a pull request may close this issue.

2 participants