Sync & Conflicts

Syncthing-Ready Architecture

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

Why Syncthing

Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur:

• No cloud dependency: Lorem ipsum dolor sit amet
• Peer-to-peer: Consectetur adipiscing elit
• End-to-end encryption: Sed do eiusmod tempor
• You control the servers: Incididunt ut labore

Folder Structure

Tasks/
├── active/
│   ├── task-001.md
│   ├── task-002.md
│   └── task-003.md
├── archive/
│   └── 2026/
│       └── 01/
│           └── completed-task.md
└── .stversions/  (Syncthing versioning)

How Sync Works

Normal Flow

Lorem ipsum dolor sit amet, consectetur adipiscing elit:

1. Edit on Device A: Task modified, saved to disk
2. Syncthing detects change: File hash updated
3. Transfer to Device B: Delta sync
4. Daylight detects change: Task reloaded

Conflict Detection

Ut enim ad minim veniam, quis nostrud exercitation:

Device A: task.md (edited 10:00)
          ↓
Device B: task.md (edited 10:01, no sync yet)
          ↓
Sync happens: CONFLICT
          ↓
Result:
  task.md (Device A version)
  task.sync-conflict-20260127-100100-ABCD.md (Device B version)

Understanding Conflict Files

What Causes Conflicts

Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore:

Conflict File Naming

original-filename.sync-conflict-YYYYMMDD-HHMMSS-DEVICEID.md

Example:

weekly-review.sync-conflict-20260127-143022-LAPTOP.md

Resolving Conflicts

Manual Resolution

Lorem ipsum dolor sit amet, consectetur adipiscing elit:

1. Open both files: Compare the original and conflict version
2. Decide what to keep: Merge changes or choose one version
3. Update the original: Apply your decision
4. Delete the conflict file: Or move to archive

Resolution Workflow

1. Daylight shows conflict indicator
   └── Task: Weekly Review ⚠️

2. View both versions
   └── Original: Lorem ipsum...
   └── Conflict: Dolor sit amet...

3. Choose action
   ├── Keep original
   ├── Keep conflict version
   └── Merge manually

4. Conflict resolved
   └── Task: Weekly Review ✓

Archiving vs Deletion

Why Archive

Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum:

• Recovery possible: Lorem ipsum dolor sit amet
• History preserved: Consectetur adipiscing elit
• Sync-safe: Sed do eiusmod tempor
• No data loss risk: Incididunt ut labore

Archive Structure

archive/
└── 2026/
    ├── 01/
    │   ├── task-completed-jan-15.md
    │   └── task-completed-jan-22.md
    └── 02/
        └── task-completed-feb-01.md

Hard Delete (When Necessary)

At vero eos et accusamus et iusto odio dignissimos:

1. Archive first (automatic)
2. Manual deletion from archive folder
3. Syncthing propagates deletion
4. Versioning keeps backup (if enabled)

Best Practices

Sync Configuration

Avoiding Conflicts

1. Sync before editing — Lorem ipsum dolor sit amet
2. One device at a time — Consectetur adipiscing elit
3. Check sync status — Sed do eiusmod tempor
4. Small, frequent syncs — Incididunt ut labore