How do I revert if something goes wrong during the resolution?

The skill is designed to work with native Git safety mechanisms. You can use 'git merge --abort' at any point during the process to return your working directory to its exact state before the merge started.

What happens if I don't like the suggested resolution?

The skill never applies changes automatically. You must approve every proposal. You have the option to apply as-is, provide instructions to modify the proposal, skip the file, or abort the entire merge.

Can this skill handle rebase or cherry-pick conflicts?

Currently, this skill specifically supports standard merge conflicts. For rebase or cherry-pick conflicts, it identifies the state and provides instructions on how to resolve them manually or abort the process safely.

Is it safe to use on sensitive files containing API keys?

Yes. The skill includes a special detection layer for sensitive files like .env, credentials.json, and .pem files, providing a high-visibility warning to ensure you review those resolutions with extra care.

Git Conflict Resolver

Name: Git Conflict Resolver
Author: biwakonbu

bybiwakonbu

0•

开发者工具

Resolves Git merge conflicts by analyzing commit history and generating intelligent integration proposals for user approval.

The Git Conflict Resolver skill automates the complex process of manual merge conflict resolution within Claude Code. It intelligently analyzes branch history and the intent behind conflicting changes using git logs and merge-base data. By categorizing conflicts into trivial (automatic) and complex (judgment-based) scenarios, it provides clear diffs and logical rationales for suggested fixes. This ensures safe and accurate code integration while maintaining a reliable rollback path via standard git commands, making it indispensable for managing large-scale feature merges.

主要功能

01Built-in security warnings for sensitive files like .env, secrets, and keys.

02Interactive approval workflow with detailed diff previews and resolution logic.

03Automated conflict detection and classification across the repository.

040 GitHub stars

05History-based intent analysis using merge-base and commit logs.

06Categorization of conflicts into 'Trivial' and 'Judgment-Required' groups.

使用场景

01Integrating upstream changes that conflict with local structural modifications.

02Resolving complex import or boilerplate conflicts across multiple files simultaneously.

03Merging feature branches into main with overlapping code changes.

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add biwakonbu/cc-plugins resolve-conflicts

For use in Claude.ai and ChatGPT

Download Skill