[release-0.3] Fix the issue of incorrect domain matching
kmesh-bot opened this issue · comments
Manual cherrypick required.
#286 failed to apply on top of branch "release-0.3":
Applying: Fix the issue of incorrect domain matching
Using index info to reconstruct a base tree...
M bpf/kmesh/include/route_config.h
Falling back to patching base and 3-way merge...
Auto-merging bpf/kmesh/include/route_config.h
CONFLICT (content): Merge conflict in bpf/kmesh/include/route_config.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix the issue of incorrect domain matching
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".