iCloud Drive Conflict Design
Updated 16 days ago · Elena Volkov
Conflict Resolution Design
Goals
•No silent data loss
•Prefer 3-way merge for trees
•User-visible only when semantic conflict
Open questions
1. Should rename storms auto-resolve with last-writer if content hash matches?
2. EU residency constraints on merge service placement?