Skip to main content

ConflictResolver

prollytree::diff

Trait ConflictResolver 

Source 
pub trait ConflictResolver {
    // Required method
    fn resolve_conflict(&self, conflict: &MergeConflict) -> Option<MergeResult>;
}
Expand description

Trait for resolving merge conflicts

Required Methods§

Source

fn resolve_conflict(&self, conflict: &MergeConflict) -> Option<MergeResult>

Resolve a conflict by returning the desired MergeResult Returns None if the conflict cannot be resolved and should remain as a conflict

Implementors§