grabbit
d40997312b
Instead of moving conflict files to a separate conflict/ directory,
keep them in the original directory with naming convention:
{name} (Warpgate Conflict {YYYY-MM-DD HH-mm}).{ext}
Benefits:
- Lightroom/Finder see both versions side by side
- Preserved extension ensures app compatibility
- Matches Dropbox/iCloud behavior users already know
- Conflict copies auto-sync to NAS via rclone (backed up)
Remote-deleted + local-dirty: file stays in place (no rename),
marked as orphan-conflict, user decides whether to re-upload.
Updated: decision matrix diagrams, scenario walkthroughs,
cache_files lifecycle, CLI commands, config section, directory
structure description.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>