Crate draxl_merge 

Merge analysis for Draxl patch streams.

The initial API focuses on hard conflicts and returns structured explanations suitable for both humans and agents.

Structs

Conflict

Structured conflict explanation suitable for humans and agents.

ConflictReport

Outcome of checking two patch streams for merge conflicts.

ConflictSide

Relevant operation from one side of the conflict.

Enums

ConflictClass

Broad conflict class.

ConflictCode

Stable conflict code for reporting and downstream handling.

ConflictOwner

Semantic owner for machine-oriented conflict reports.

ConflictRegion

Semantic region for machine-oriented conflict reports.

ReplayOrder

Replay order used for hard-conflict checking.

ReplayStage

Replay stage that failed.

Functions

check_conflicts

Checks both hard and semantic conflicts against the same base.

check_conflicts_for_language

Checks both hard and semantic conflicts against the same base using the selected lower language.

check_hard_conflicts

Checks whether two patch streams have hard conflicts against the same base.

check_hard_conflicts_for_language

Checks whether two patch streams have hard conflicts against the same base using the selected lower language.

Type Aliases

HardConflictReport

Backward-compatible alias for the old hard-only report name.