Do I need any additional tools for this skill to work?

This skill utilizes the GitHub CLI (gh) to fetch PR metadata and the standard Git CLI for repository operations. Both should be authenticated in your environment.

How does this skill resolve code conflicts differently than standard Git?

Unlike standard Git, this skill analyzes Pull Request descriptions and issue context to understand the intent of the changes, allowing it to make smarter decisions about which code to keep or combine.

Does it support specific file types like package.json?

Yes, it has specialized logic for package.json and configuration files, prioritizing higher dependency versions and merging settings rather than choosing one version over the other.

What happens if a merge is too complex for the AI?

The skill includes a safety threshold that automatically aborts the merge and notifies the user if more than 10 files contain conflicts, preventing potential errors in highly complex scenarios.

Smart Git Merge

Name: Smart Git Merge
Author: Devattom

byDevattom

0•

개발자 도구

Streamlines branch integration with context-aware conflict resolution and automated GitHub PR analysis.

Smart Git Merge is an advanced capability for Claude Code designed to handle complex branch integrations with intelligence and safety. By leveraging GitHub PR metadata, commit history, and issue context, this skill goes beyond standard git commands to understand the intent behind code changes. It features specialized logic for resolving conflicts in package.json and configuration files, while implementing strict safety protocols—such as a 10-file conflict limit and automated post-merge verification—to ensure codebase integrity during the merge process.

주요 기능

010 GitHub stars

02Automated GitHub CLI integration for deep feature analysis

03Context-aware conflict resolution using PR and issue descriptions

04Post-resolution verification to ensure no conflict markers remain

05Safety-first approach with automated merge aborting for complex conflicts

06Specialized dependency merging for package.json and config files

사용 사례

01Automating the synchronization of fork branches with upstream repositories

02Integrating large feature branches with overlapping source code changes

03Resolving complex dependency version conflicts in JavaScript projects

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add devattom/.claude git-merge

For use in Claude.ai and ChatGPT