How does this skill resolve merge conflicts?

It analyzes PR descriptions, commit history, and file types to understand the intent of changes, applying specific logic for source code, imports, and configuration files.

Does it commit changes automatically?

It performs a dry merge first, resolves conflicts, and only commits once it has verified that no conflict markers remain and the changes are validated.

Can it handle package.json conflicts automatically?

Yes, it specifically manages dependency conflicts by preferring higher versions or merging non-overlapping updates to ensure project stability.

What happens if there are too many conflicts?

As a safety measure, the skill will abort the operation and prompt the user for intervention if more than 10 files contain conflicts.

Does this skill require the GitHub CLI (gh)?

Yes, it utilizes 'gh' to fetch metadata from Pull Requests, which provides the necessary context for intelligent resolution decisions.

Smart Git Merge

Name: Smart Git Merge
Author: flosrn

byflosrn

0•

Developer Tools

Automates Git branch merging with context-aware conflict resolution and intent-based analysis.

This skill empowers Claude to manage the Git merging process end-to-end, moving beyond simple CLI commands to perform intelligent, context-aware conflict resolution. By fetching Pull Request metadata via the GitHub CLI and analyzing the intent behind changes—such as distinguishing between bug fixes and refactors—it makes informed decisions on how to resolve overlaps in source code, configuration files, and dependencies. It prioritizes repository health through pre-merge safety checks, automated verification, and a fail-safe mechanism that halts operations if conflicts exceed manageable complexity, ensuring a clean and stable version history.

Key Features

01Specialized handling for package.json and configuration file dependencies

02Post-merge verification via grep and diff checks

030 GitHub stars

04Automated pre-merge working tree and status validation

05Multi-file conflict resolution with logic-driven intent analysis

06Contextual conflict resolution using PR and issue descriptions

Use Cases

01Resolving versioning conflicts in dependency manifest files like package.json

02Synchronizing local branches with remote updates while maintaining custom refactors

03Merging complex feature branches into main with minimal manual intervention

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add flosrn/.claude git-merge

For use in Claude.ai and ChatGPT