-
Bug
-
Resolution: Unresolved
-
Undefined
-
None
-
4.21
Description of problem
Dependabot is currently enabled in the downstream bond-cni repository, which causes conflicts during sync operations with upstream. Dependencies must be updated in the upstream repository first to avoid merge conflicts.
Additional info
PR implementing the fix: https://github.com/openshift/bond-cni/pull/105
Using git mv instead of deletion ensures smooth merges when the file is updated upstream.