skills.rest
zenbuapps
zenbuappsOFFICIAL
Explore all skills by this author →
GitHub

conflict-resolver

Automate git conflict resolution workflows with user-confirmed plans and test commands.

1|Updated Mar 6, 2026
Search Tags:#automation#git#workflow#planning#branching#conflicts
One-click install
npx skills add https://github.com/zenbuapps/zenbu-powers --skill conflict-resolver-zenbuapps
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: conflict-resolver
Source: https://github.com/zenbuapps/zenbu-powers/tree/main/skills/conflict-resolver
Command: npx skills add https://github.com/zenbuapps/zenbu-powers --skill conflict-resolver-zenbuapps

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes references (resource) components.

What problem does it solve?

Conflict resolution in Git workflows: from reconnaissance to pushing, with classification, planning, testing, and automated checks when the conflict-resolver agent loads.

Core Features & Use Cases

  • Phase-based workflow covers reconnaissance, analysis, planning, execution, testing, and push strategies.
  • Automatic conflict-resolution planning with user confirmation before applying changes.
  • Semantic analysis support via Serena to understand symbol references when resolving conflicts.
  • Non-destructive approach that preserves both sides' intent and requires explicit approval for merges.

Quick Start

Provide an initial conflict-resolution plan for the current merge scenario and await user confirmation before proceeding.

Frequently Asked Questions about conflict-resolver

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I automate git conflict resolution for multi-branch merges?▼

Git conflict resolution automation manages multi-branch workflows from reconnaissance to pushing via classification, planning, and automated checks. It generates a structured conflict plan and requires explicit user confirmation before executing any merges.

What is the best way to plan branch merge conflicts without losing code?▼

A non-destructive approach preserves both sides' intent during branch merges. It requires explicit user approval before applying any changes, ensuring no code intent is lost during the conflict resolution workflow.

How does semantic analysis work with git conflict resolution workflows?▼

Semantic analysis integrates via Serena to understand symbol references when resolving conflicts. This helps analyze code structure and context during the planning phase to generate accurate conflict resolution strategies.

Does the conflict resolution workflow require manual testing after merging?▼

The workflow includes a dedicated testing phase that outputs structured test commands. You execute these commands to validate the merge after the automated execution phase completes successfully.

What are the limitations of automating git conflict resolution?▼

Automation requires user confirmation before applying plans and enforces a non-destructive approach. It does not automatically push changes without explicit approval, ensuring safety in collaborative coding projects with frequent branch merges.

Related Skills

Explore More Software Engineering Skills→
bdbchbdbch
2

git-operations

Automate Git workflows with commit formatting, branch management, and pull request creation.

Community
Intermediate
mixomatmixomat

clean-gone-branches

Delete local git branches marked [gone] while skipping worktree branches.

Community
Intermediate
Ho-Gyu-LeeHo-Gyu-Lee

serena-mcp

Analyzes code structure and stores project knowledge using the Serena MCP toolset.

Community
Advanced
ahoymahoym
2

git-preview-conflicts

Identify conflicting files between Git branches without executing a merge.

Community
Intermediate