Can this skill automatically commit the resolved conflicts?

No, the skill is designed to stage the resolved changes and prompt the user for a final review before any commit is finalized.

How does the skill handle sensitive configuration files?

The skill includes built-in constraints that prevent auto-resolution for files like .env, migrations, and config files, requiring explicit user confirmation instead.

What happens if a conflict is too complex for the AI to resolve?

The skill provides a detailed breakdown of the conflicting lines, explains the intent of both branches, and offers multiple proposals (A, B, C, or D) for the user to choose from.

Does this skill support remote branch synchronization?

Yes, the workflow includes fetching the latest remote state and pulling updates to the local base branch before initiating the merge process.

Git Merge Conflict Resolver

Name: Git Merge Conflict Resolver
Author: mattermost

bymattermost

•

Developer Tools

Automates the intelligent resolution of git merge conflicts by analyzing change intent across feature and base branches.

The Git Merge Conflict Resolver skill transforms Claude into a specialized agent for handling complex version control merges. It follows a systematic workflow that includes identifying the correct base branch, analyzing the specific intent behind feature branch commits, and synchronizing with remote repositories. Using a sophisticated decision framework, it can automatically resolve structural or incidental conflicts while identifying scenarios that require human intervention. This skill ensures repository integrity by adhering to strict safety constraints, such as refusing to force-push and protecting sensitive configuration files from automated changes.

Key Features

01Comprehensive merge reporting including auto-resolved vs. user-resolved counts

02Intelligent intent analysis to distinguish between refactors, bug fixes, and incidental changes

03Safety protections for sensitive files like .env, migrations, and config files

04Automated base branch detection and remote synchronization

05Decision framework for accepting incoming or current changes based on commit history

061 GitHub stars

Use Cases

01Resolving complex conflicts when merging a long-lived feature branch back into main

02Synchronizing local branches with upstream changes to minimize technical debt

03Automating the cleanup of conflicts in lockfiles, auto-generated code, or build artifacts

What are Skills?·How to Install

Install with 🐟 Skill.Fish

npx skillfish add mattermost/mattermost-ai-marketplace conflicts

For use in Claude.ai and ChatGPT

Download Skill