Conflicts

Workflow and current contract

ConflictResolver::new(strategy) evaluates a Conflict using its source/target file information and conflict type. resolve returns a ConflictResolution; it does not itself write either filesystem.

The high-level synchronization engine has its own conflict handling. In particular, bidirectional modified/content-only paths can return a synchronization conflict instead of automatically applying a NewerWins result. Choose and review a resolution before issuing the corresponding write.

Source reference

• conflict declarations — local/agentfs-mirror/src/conflict.rs.
• sync declarations — local/agentfs-mirror/src/sync.rs.