skills.rest
VectorInstitute
VectorInstituteOFFICIAL
Explore all skills by this author →
WebsiteGitHub

fix-merge-conflicts

Resolve git merge conflicts across dependency, source, and configuration files.

Updated Dec 15, 2025
One-click install
npx skills add https://github.com/VectorInstitute/aieng-bot-maintain --skill fix-merge-conflicts
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: fix-merge-conflicts
Source: https://github.com/VectorInstitute/aieng-bot-maintain/tree/main/.claude/skills/fix-merge-conflicts
Command: npx skills add https://github.com/VectorInstitute/aieng-bot-maintain --skill fix-merge-conflicts

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) components.

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.

Frequently Asked Questions about fix-merge-conflicts

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I automatically resolve git merge conflicts in my pull request?▼

Merge conflicts occur when git cannot automatically combine changes from different branches. This Skill detects conflicting files across dependency files, lock files, source code, and configuration, then applies file-type-specific resolution rules—preferring newer versions in package.json, regenerating lock files, and preserving functionality in source code—resulting in commit-ready changes.

Can this resolve conflicts in package.json, requirements.txt, and lock files?▼

Yes. This Skill resolves conflicts across dependency files like package.json and requirements.txt by merging version additions from both sides and preferring newer versions. Lock files are regenerated rather than manually edited to ensure consistency and validity.

What happens to bot-generated files when resolving merge conflicts?▼

The Skill never commits bot-generated files such as .claude/, .pr-context.json, or .failure-logs.txt. It filters these out during finalization, ensuring only actual conflict fixes are included in the commit to the PR branch.

How does this handle conflicts in configuration files?▼

Configuration conflicts are resolved by logically merging changes while preserving important workflow improvements. The Skill applies context-aware rules that balance both sides' modifications rather than taking one wholesale.

Will syntax validation occur after conflicts are resolved?▼

Yes. The Skill validates syntax across resolved files and regenerates lock files as needed, delivering functionally correct, syntax-valid changes that are ready to commit.

Related Skills

Explore More Software Engineering Skills→
AztecProtocolAztecProtocol
449

rebase-pr

Rebase a pull request onto its base branch and resolve conflicts with git and GitHub CLI.

Official
Intermediate
MartinoPoloMartinoPolo
1

mp-sync-base

Merge a target branch into the current branch with Git safety checks.

Community
Intermediate
rhpdsrhpds

04-git-mcp

Connect Claude Code to the Git MCP server for repository operations.

Official
Advanced
lucasilverentandlucasilverentand
3

merge-conflicts

Detect and resolve Git merge conflicts across single or multiple files.

Community
Basic