fix-merge-conflict
CommunityResolve Git merge conflicts automatically.
Authoryulonglin
Version1.0.0
Installs0
System Documentation
What problem does it solve?
Automatically resolve merge conflicts on the current Git branch non-interactively and ensure the repo builds and tests pass.
Core Features & Use Cases
- Non-interactive conflict detection using git status and conflict-marker scanning
- Per-file conflict resolution prioritizing buildable, test-passing results
- Safe, deterministic merges that preserve public APIs and behavior
- Use case: When integrating a feature branch into main, automatically resolve conflicts when possible and keep the codebase green.
Quick Start
From the repository root, run the tool to automatically fix current merge conflicts and verify the repository builds and tests pass.
Dependency Matrix
Required Modules
None requiredComponents
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-merge-conflict Download link: https://github.com/yulonglin/dotfiles/archive/main.zip#fix-merge-conflict Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
Agent Skills Search Helper
Install a tiny helper to your Agent, search and equip skill from 223,000+ vetted skills library on demand.