Skip to content

[release-1.18] Bump github.com/lestrrat-go/jwx from 1.2.25 to 1.2.26 #45586

Closed
@istio-testing

Description

Manual cherrypick required.

#45464 failed to apply on top of branch "release-1.18":

Applying: Bump github.com/lestrrat-go/jwx from 1.2.25 to 1.2.26
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump github.com/lestrrat-go/jwx from 1.2.25 to 1.2.26
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".

Metadata

Assignees

Labels

No labels
No labels

Type

No type

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions