Module merge_errors 

Actionable error messages for merge operations.

Provides structured error messages with context, diagnosis, and concrete next steps to help users recover from merge failures.

Structs

MergeContext

Context information for a merge error

MergeError

Structured merge error with kind and context

Enums

ConflictType

Conflict type classification for merge operations.

MergeErrorKind

Merge error kind - the type of merge failure

Functions

branch_not_found

classify_conflict_type

Classify merge conflict type from git output.

driver_members_incomplete

fast_forward_conflict

generic_merge_failed

main_branch_not_found

member_merge_failed

merge_conflict

merge_conflict_detailed

Detailed merge conflict error with file list and recovery steps.

merge_stopped

no_branch_for_spec

no_commits_found

parse_conflicting_files

Parse conflicting files from git status –porcelain output.

rebase_conflict

rebase_stopped

spec_status_not_mergeable

worktree_already_exists