fix-vendor-conflicts

Official

Resolve vendor conflicts during merges and upgrades.

Authorgrafana
Version1.0.0
Installs0

System Documentation

What problem does it solve?

Guides users through diagnosing and resolving vendor/ conflicts caused by dependency changes during merges, rebases, or upgrades.

Core Features & Use Cases

  • Guided conflict diagnosis: Identifies when vendor/ changes cause breaks after dependency bumps.
  • Safe remediation workflow: Encourages upgrades and pinning upstream dependencies instead of patching vendor/.
  • Guardrails & verification: Enforces pre-commit checks and reproducible builds before committing.

Quick Start

Begin by inspecting go.mod and vendor changes, then run tidy to surface issues and apply upstream fixes.

Dependency Matrix

Required Modules

None required

Components

Standard package

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: fix-vendor-conflicts
Download link: https://github.com/grafana/tempo/archive/main.zip#fix-vendor-conflicts

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 510,000+ vetted skills library on demand.