fix-merge-conflicts

What problem does it solve?

This Skill automates the resolution of git merge conflicts in a Vector Institute repository, across dependency files, source code, and configuration. It emphasizes safety by never committing bot-generated files and by guiding users through conflict resolution best practices.

Core Features & Use Cases

• Conflict Detection: Identify conflicting files via git status and diff --name-only --diff-filter=U
• Resolution Strategies by File Type:
  • Dependency Files (package.json, requirements.txt): prefer newer versions and merge additions from both sides
  • Lock Files (package-lock.json, poetry.lock): avoid manual edits; regenerate when needed
  • Source Code: preserve functionality from both sides; prefer the more recent version; combine non-conflicting changes
  • Configuration Files: logically merge changes while preserving important workflow improvements
• Safety & Finalization:
  • Never commit bot files (.claude/, .pr-context.json, .failure-logs.txt)
  • Ensure final commits include only the actual fixes
  • Follow the prescribed commit and push workflow to the PR branch

Quick Start

Trigger this Skill when a PR has merge conflicts. It will guide you through conflict resolution, apply vetted changes, and commit only the real fixes to the PR branch.