fix-conflict

What problem does it solve?

This Skill eliminates the manual, error-prone process of resolving merge conflicts by automating branch creation, merging, per-file conflict analysis, validation, and merge request creation so developers can recover stalled merges quickly and safely.

Core Features & Use Cases

• Automated fix branch creation: Create a fix branch from the target branch using a standardized naming convention and fetch the source branch for merging.
• Per-file conflict analysis and resolution guidance: Detect conflict markers, analyze context to choose source/target or merge changes, and escalate to the user when semantic decisions are required.
• Build and validation checks: Run language-specific verification (Go, Node, Java) and require user confirmation on failures before proceeding.
• Safe MR creation and pipeline integration: Push the fix branch and open a merge request with generated title/description, optionally assign reviewers, and enforce safety rules (no force-push, no automatic approve/merge).
• Trigger modes: Run on user request, from an MR URL/IID, or automatically via Pipeline Watch when merge jobs fail due to conflicts.

Quick Start

Resolve conflicts by creating a fix branch from the target branch, merging the source branch, resolving file conflicts with build validation, and opening a merge request to the target branch.