iOS: conflicts, sync conflict copies, recovered versions !116

merged merged by cmc on 2026-10-07 00:09 UTC · krz/orgstar:ios-conflicts into main

Discussion

cmc

iOS parity step 4, last part. Tried in the iOS 27 Simulator: a Syncthing copy resolved with Use Copy, a conflicting disk write merged with markers, and a recovered version restored.