Conflicts and recovery
Understand keep-both conflicts, interrupted applies, and deterministic recovery.
Concurrent ordinary edits are preserved beside the accepted path with a grep-friendly CODEFOLDERSYNC-CONFLICT name. Code Folder Sync does not perform a line merge and does not silently choose the last writer.
Resolve a conflict with normal editor and Git tools, keep the intended result, and remove the conflict sibling only after you have reviewed it. That deletion synchronizes like any other deliberate change.
Applies are journaled. Interrupted replacements retain recovery data, and ambiguous state fails closed for the affected path. Run codefoldersync doctor and codefoldersync verify --full after an incident before restarting normal synchronization.