Struct ConflictResolver 

pub struct ConflictResolver;

Detects and resolves file conflicts when target path already exists

Implementations

impl ConflictResolver

pub fn new() -> Self

Creates a new ConflictResolver instance

pub async fn detect_conflict( &self, path: &Path, new_content: &str, ) -> Result<Option<ConflictInfo>, FileError>

Detects conflicts by checking if target file exists

Arguments

• path - Path to check for conflicts

Returns

Ok(Some(ConflictInfo)) if conflict exists, Ok(None) if no conflict, or an error if the check fails

pub fn resolve( &self, strategy: ConflictResolution, conflict_info: &ConflictInfo, ) -> Result<(), FileError>

Resolves a conflict using the specified strategy

Arguments

• strategy - The resolution strategy to use
• conflict_info - Information about the conflict

Returns

Ok(()) if resolution succeeds, or an error if it fails

pub fn merge_content(existing: &str, new: &str) -> String

Performs a simple merge of two content versions

Arguments

• existing - The existing content
• new - The new content

Returns

Merged content

Trait Implementations

impl Clone for ConflictResolver

fn clone(&self) -> ConflictResolver

Returns a duplicate of the value.

fn clone_from(&mut self, source: &Self)

Performs copy-assignment from source.

impl Debug for ConflictResolver

fn fmt(&self, f: &mut Formatter<'_>) -> Result

Formats the value using the given formatter.

impl Default for ConflictResolver

fn default() -> Self

Returns the “default value” for a type.