Struct ConflictFile 

pub struct ConflictFile {
    pub hash_length: usize,
}

Conflict-file resolution (recommended for peer sync)

When a conflict is detected, renames the incoming file to include a version suffix based on the content hash: <name>@<short-hash>.<ext>.

This preserves both versions:

• The base (local) operation wins and keeps the original path
• The incoming operation is renamed to a conflict file with its content version

Users can then manually review and resolve the conflict files.

Example

If document.txt conflicts and incoming has content hash abc123...:

• Local version stays at document.txt
• Incoming version becomes document@abc123de.txt

Fields

hash_length: usize

Number of hex characters to use from the hash (default: 8)

Implementations

impl ConflictFile

pub fn new() -> Self

Create a new ConflictFile resolver with default settings

pub fn with_hash_length(hash_length: usize) -> Self

Create a new ConflictFile resolver with custom hash length

pub fn conflict_path(path: &Path, version: &str) -> PathBuf

Generate a conflict filename using a version string

Format: <name>@<version> (extension precedes the @)

Examples: config.toml@abc123de, README@abc123de

Trait Implementations

impl Clone for ConflictFile

fn clone(&self) -> ConflictFile

Returns a duplicate of the value.

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

Performs copy-assignment from source.

impl ConflictResolver for ConflictFile

fn resolve(&self, conflict: &Conflict, _local_peer: &PublicKey) -> Resolution

Resolve a conflict between two operations on the same path

impl Debug for ConflictFile

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

Formats the value using the given formatter.

impl Default for ConflictFile

fn default() -> ConflictFile

Returns the “default value” for a type.