Merge Conflict Resolver Skill

Overview

A comprehensive skill for analyzing Git branch divergence, detecting potential merge conflicts before they occur, and guiding users through systematic conflict resolution. This skill provides both automated analysis and manual resolution workflows.

Features

1. Intelligent Auto-Detection

• Detects current branch automatically if not specified
• Auto-discovers repository root using git rev-parse --show-toplevel
• Defaults to origin/main as target branch (configurable)
• Works in any Git repository without hardcoded paths