Fixing Vendor Conflicts

Use this skill when resolving conflicts in vendor/ during a merge, rebase, or dependency upgrade.

Before starting

Ask the user: are you working on the main branch or a release branch? The answer changes what kinds of fixes are acceptable (see below).

What this skill does

Guides the process of diagnosing and resolving vendor directory conflicts caused by dependency changes — whether a direct bump or a transitive cascade.

Core principles

Never patch vendor/ files manually. CI runs go mod vendor and will overwrite any manual patches. All fixes must come from upgrading or pinning the upstream dependency to a version that has the fix already.

Always run the pre-commit checklist before committing anything: