resolve-conflicts

Automate git merge conflict resolution with confidence gating and human approval.

6|1|Updated Mar 16, 2026

Search Tags:#automation #git #agent #merge #resolution #conflicts

Ready to run

npx skills add https://github.com/navapbc/digital-service-orchestra --skill resolve-conflicts-navapbc

💬 Prompt for ChatGPT / Claude Chat▼

Please help me install this Agent Skill.
Skill: resolve-conflicts
Source: https://github.com/navapbc/digital-service-orchestra/tree/main/plugins/dso/skills/resolve-conflicts
Command: npx skills add https://github.com/navapbc/digital-service-orchestra --skill resolve-conflicts-navapbc

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill automates agent-assisted git merge conflict resolution with confidence gating, reducing manual rework and accelerating safe integration.

Core Features & Use Cases

Auto-resolve trivial conflicts to keep development flowing.
Classify conflicts by semantic complexity and present non-trivial cases for human review.
Coordinate with merge-state and agent tooling to ensure safe, auditable resolutions.

Quick Start

Invoke the conflict resolution workflow on your current merge with /dso:resolve-conflicts.

Frequently Asked Questions about resolve-conflicts

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

FAQPage Schema

How do I automate git merge conflict resolution?▼

You can automate git merge conflict resolution by invoking an agent-assisted workflow that classifies conflicts, auto-resolves trivial ones, and gates non-trivial cases for human approval. This reduces manual rework and accelerates safe integration during merge and rebase operations.

How does agent-assisted conflict resolution handle complex merges?▼

Agent-assisted conflict resolution classifies conflicts by semantic complexity. It auto-resolves trivial conflicts to keep development flowing, while presenting non-trivial cases for human review to ensure safe and auditable resolutions.

Do I need to configure anything before using automated git conflict resolution?▼

Automated git conflict resolution operates within your existing Git merge and rebase workflows. You invoke the workflow on your current merge, and it coordinates with merge-state and agent tooling to validate results before finalization.

What is the best way to resolve trivial git conflicts automatically?▼

The best way to resolve trivial git conflicts automatically is using an agent-assisted workflow with confidence gating. It keeps development flowing by auto-resolving trivial conflicts and coordinating with agent tooling to validate results before finalization.

When should I not use automated conflict resolution during a git rebase?▼

You should not use automated conflict resolution for non-trivial cases without human review. The workflow gates these complex, non-trivial conflicts for manual approval to ensure safe, auditable resolutions rather than blindly finalizing them.