Module conflict 

Conflict detection and resolution spec creation.

This module handles detection of merge conflicts and automatic creation of conflict resolution specs with context about the conflicting branches.

Doc Audit

• audited: 2026-01-25
• docs: guides/recovery.md
• ignore: false

Structs

ConflictContext

Context information about a merge conflict

Functions

create_conflict_spec

Create a conflict resolution spec

detect_conflicting_files

Detect conflicting files from git status

extract_spec_context

Extract context from a spec

get_blocked_specs

Identify specs that are blocked by conflicting files

get_diff_summary

Get the diff summary between two branches