fix-vendor-conflicts

To resolve vendor conflicts in Go projects after a dependency upgrade, inspect go.mod and vendor changes, run tidy to surface issues, apply upstream fixes, and verify reproducible builds before committing.

You should never manually patch vendor files because it breaks build reproducibility and complicates future maintenance. Safe remediation requires upgrading and pinning upstream dependencies instead of directly editing vendor directory contents.

The required pre-commit checklist for tidying Go modules and vendor directories mandates running tidy, vendor, build, tests, and manifest regeneration to enforce guardrails and verify reproducible builds before committing changes.

Yes, this workflow handles transitive dependency cascades during merges and rebases. It guides users through diagnosing vendor conflicts caused by both direct dependency bumps and transitive cascades on main or release branches.

The best way to diagnose vendor breaks caused by go.mod changes is to begin by inspecting go.mod and vendor differences, then run tidy to surface underlying issues and apply necessary upstream dependency fixes.

You need to regenerate manifests during Go vendor conflict resolution as a mandatory step in the pre-commit checklist, ensuring build reproducibility and proper dependency tracking after applying upstream fixes.