Module merge_errors

Expand description

Actionable error messages for merge operations.

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

Enums§

branch_not_found: Format a spec branch not found error.
classify_conflict_type: Classify merge conflict type from git output.
driver_members_incomplete: Format a driver spec member incomplete error.
fast_forward_conflict: Format a fast-forward merge failure with actionable next steps.
generic_merge_failed: Format a generic merge failure in the merge summary with next steps.
main_branch_not_found: Format a main branch not found error.
member_merge_failed: Format a member spec merge failure within a driver merge.
merge_conflict: Format a merge conflict error with recovery steps.
merge_conflict_detailed: Detailed merge conflict error with file list and recovery steps.
merge_stopped: Format a merge stopped error when –continue-on-error is not set.
no_branch_for_spec: Format a no-branch-found error for a completed spec.
no_commits_found: Format a no-commits-found error with branch diagnostic info.
parse_conflicting_files: Parse conflicting files from git status –porcelain output.
rebase_conflict: Format a rebase conflict error with recovery steps.
rebase_stopped: Format a rebase stopped error with –auto suggestion.
spec_status_not_mergeable: Format a failed spec merge error with status context.
worktree_already_exists: Format a worktree conflict error when a worktree already exists.