Struct ConflictResolver 

pub struct ConflictResolver;

Resolves file conflicts using specified strategy

Implements requirements:

• Requirement 4.2: Skip strategy
• Requirement 4.3: Overwrite strategy with backup
• Requirement 4.4: Merge strategy
• Requirement 4.5: Prompt strategy

Implementations

impl ConflictResolver

pub fn new() -> Self

Create a new conflict resolver

pub fn resolve( &self, conflict: &FileConflictInfo, strategy: ConflictStrategy, new_content: &str, ) -> Result<ConflictResolutionResult, GenerationError>

Resolve a single conflict using the specified strategy

Arguments

• conflict - Conflict information
• strategy - Resolution strategy to apply
• new_content - New content to write

Returns

Resolution result

Requirements

• Requirement 4.2: Skip strategy
• Requirement 4.3: Overwrite strategy with backup
• Requirement 4.4: Merge strategy

pub fn is_auto_mergeable(&self, conflict: &FileConflictInfo) -> bool

Check if a conflict can be auto-merged

Returns true if the conflict can be automatically resolved without user intervention.

Arguments

• conflict - Conflict to check

Returns

True if auto-mergeable

pub fn describe_strategy(&self, strategy: ConflictStrategy) -> &'static str

Get a human-readable description of a strategy

Arguments

• strategy - Strategy to describe

Returns

Description string

Trait Implementations

impl Default for ConflictResolver

fn default() -> Self

Returns the “default value” for a type.