{"type":"excalidraw","version":2,"source":"https://AwesomeSystemDesign.dev","elements":[{"angle":0,"strokeColor":"#628572","backgroundColor":"#edf5ee","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-1"],"frameId":null,"roundness":null,"boundElements":[{"type":"text","id":"shape-1"}],"updated":0,"link":null,"locked":false,"id":"shape-0","type":"rectangle","seed":41,"x":30,"y":30,"width":576.96844,"height":68,"customData":{"revealStep":1}},{"angle":0,"strokeColor":"#394557","backgroundColor":"transparent","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-1"],"frameId":null,"roundness":null,"boundElements":null,"updated":0,"link":null,"locked":false,"id":"shape-1","type":"text","seed":114,"x":50,"y":52.3,"width":536.96844,"height":23.400000000000002,"fontSize":18,"fontFamily":1,"text":"Conflict Scenario: Same file edited on two offline devices","originalText":"Conflict Scenario: Same file edited on two offline devices","textAlign":"left","verticalAlign":"middle","containerId":"shape-0","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":1}},{"angle":0,"strokeColor":"#a68a53","backgroundColor":"#fff7e6","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-2"],"frameId":null,"roundness":null,"boundElements":[{"type":"text","id":"shape-3"}],"updated":0,"link":null,"locked":false,"id":"shape-2","type":"rectangle","seed":187,"x":30,"y":123,"width":653.3456800000001,"height":176.4,"customData":{"revealStep":2}},{"angle":0,"strokeColor":"#394557","backgroundColor":"transparent","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-2"],"frameId":null,"roundness":null,"boundElements":null,"updated":0,"link":null,"locked":false,"id":"shape-3","type":"text","seed":260,"x":50,"y":141,"width":613.3456800000001,"height":140.4,"fontSize":18,"fontFamily":1,"text":"Timeline:\nT0: File \"doc.txt\" is v5 on all devices\nT1: Device A goes offline, edits doc.txt → local v6a\nT2: Device B goes offline, edits doc.txt → local v6b\nT3: Device A comes online → uploads v6a → server accepts as v6\nT4: Device B comes online → uploads v6b → CONFLICT!","originalText":"Timeline:\nT0: File \"doc.txt\" is v5 on all devices\nT1: Device A goes offline, edits doc.txt → local v6a\nT2: Device B goes offline, edits doc.txt → local v6b\nT3: Device A comes online → uploads v6a → server accepts as v6\nT4: Device B comes online → uploads v6b → CONFLICT!","textAlign":"left","verticalAlign":"middle","containerId":"shape-2","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":2}},{"angle":0,"strokeColor":"#9180ac","backgroundColor":"#f4effb","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-3"],"frameId":null,"roundness":null,"boundElements":[{"type":"text","id":"shape-5"}],"updated":0,"link":null,"locked":false,"id":"shape-4","type":"rectangle","seed":333,"x":30,"y":324.4,"width":478.3057600000001,"height":129.60000000000002,"customData":{"revealStep":3}},{"angle":0,"strokeColor":"#394557","backgroundColor":"transparent","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-3"],"frameId":null,"roundness":null,"boundElements":null,"updated":0,"link":null,"locked":false,"id":"shape-5","type":"text","seed":406,"x":50,"y":342.4,"width":438.3057600000001,"height":93.60000000000001,"fontSize":18,"fontFamily":1,"text":"Detection:\nDevice B: \"I'm uploading based on v5\"\nServer: \"Current version is v6 (from Device A)\"\nBase version mismatch → CONFLICT","originalText":"Detection:\nDevice B: \"I'm uploading based on v5\"\nServer: \"Current version is v6 (from Device A)\"\nBase version mismatch → CONFLICT","textAlign":"left","verticalAlign":"middle","containerId":"shape-4","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":3}},{"angle":0,"strokeColor":"#6577aa","backgroundColor":"#eef1fc","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-4"],"frameId":null,"roundness":null,"boundElements":[{"type":"text","id":"shape-7"}],"updated":0,"link":null,"locked":false,"id":"shape-6","type":"rectangle","seed":479,"x":30,"y":479,"width":420,"height":68,"customData":{"revealStep":4}},{"angle":0,"strokeColor":"#394557","backgroundColor":"transparent","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-4"],"frameId":null,"roundness":null,"boundElements":null,"updated":0,"link":null,"locked":false,"id":"shape-7","type":"text","seed":552,"x":50,"y":501.3,"width":380,"height":23.400000000000002,"fontSize":18,"fontFamily":1,"text":"Resolution strategies:","originalText":"Resolution strategies:","textAlign":"left","verticalAlign":"middle","containerId":"shape-6","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":4}},{"angle":0,"strokeColor":"#628572","backgroundColor":"#edf5ee","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-5"],"frameId":null,"roundness":null,"boundElements":[{"type":"text","id":"shape-9"}],"updated":0,"link":null,"locked":false,"id":"shape-8","type":"rectangle","seed":625,"x":30,"y":572,"width":552.08812,"height":129.60000000000002,"customData":{"revealStep":5}},{"angle":0,"strokeColor":"#394557","backgroundColor":"transparent","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-5"],"frameId":null,"roundness":null,"boundElements":null,"updated":0,"link":null,"locked":false,"id":"shape-9","type":"text","seed":698,"x":50,"y":590,"width":512.08812,"height":93.60000000000001,"fontSize":18,"fontFamily":1,"text":"Strategy 1: Last-Writer-Wins (simplest, data loss risk)\n→ Server accepts v6b, overwrites v6a\n→ v6a saved as a version in history (recoverable)\n❌ Alice's changes may be silently \"lost\" (only in history)","originalText":"Strategy 1: Last-Writer-Wins (simplest, data loss risk)\n→ Server accepts v6b, overwrites v6a\n→ v6a saved as a version in history (recoverable)\n❌ Alice's changes may be silently \"lost\" (only in history)","textAlign":"left","verticalAlign":"middle","containerId":"shape-8","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":5}},{"angle":0,"strokeColor":"#a68a53","backgroundColor":"#fff7e6","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-6"],"frameId":null,"roundness":null,"boundElements":[{"type":"text","id":"shape-11"}],"updated":0,"link":null,"locked":false,"id":"shape-10","type":"rectangle","seed":771,"x":30,"y":726.6,"width":579.46792,"height":153,"customData":{"revealStep":6}},{"angle":0,"strokeColor":"#394557","backgroundColor":"transparent","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-6"],"frameId":null,"roundness":null,"boundElements":null,"updated":0,"link":null,"locked":false,"id":"shape-11","type":"text","seed":844,"x":50,"y":744.6,"width":539.46792,"height":117,"fontSize":18,"fontFamily":1,"text":"Strategy 2: Conflict Copy (Dropbox approach) ✅\n→ Server keeps v6 (Device A's version)\n→ Creates \"doc (conflicted copy - Device B).txt\" with v6b\n→ User manually merges or picks the right version\n→ No data loss; user decides","originalText":"Strategy 2: Conflict Copy (Dropbox approach) ✅\n→ Server keeps v6 (Device A's version)\n→ Creates \"doc (conflicted copy - Device B).txt\" with v6b\n→ User manually merges or picks the right version\n→ No data loss; user decides","textAlign":"left","verticalAlign":"middle","containerId":"shape-10","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":6}},{"angle":0,"strokeColor":"#9180ac","backgroundColor":"#f4effb","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-7"],"frameId":null,"roundness":null,"boundElements":[{"type":"text","id":"shape-13"}],"updated":0,"link":null,"locked":false,"id":"shape-12","type":"rectangle","seed":917,"x":30,"y":904.6,"width":580.00216,"height":153,"customData":{"revealStep":7}},{"angle":0,"strokeColor":"#394557","backgroundColor":"transparent","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-7"],"frameId":null,"roundness":null,"boundElements":null,"updated":0,"link":null,"locked":false,"id":"shape-13","type":"text","seed":990,"x":50,"y":922.6,"width":540.00216,"height":117,"fontSize":18,"fontFamily":1,"text":"Strategy 3: Automatic Merge (for text/structured files)\n→ Three-way merge: base(v5), ours(v6a), theirs(v6b)\n→ If changes in different sections → auto-merge\n→ If changes in same section → conflict markers (like git)\n→ Best for code, documents; not for binary files","originalText":"Strategy 3: Automatic Merge (for text/structured files)\n→ Three-way merge: base(v5), ours(v6a), theirs(v6b)\n→ If changes in different sections → auto-merge\n→ If changes in same section → conflict markers (like git)\n→ Best for code, documents; not for binary files","textAlign":"left","verticalAlign":"middle","containerId":"shape-12","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":7}},{"angle":0,"strokeColor":"#6577aa","backgroundColor":"#eef1fc","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-8"],"frameId":null,"roundness":null,"boundElements":[{"type":"text","id":"shape-15"}],"updated":0,"link":null,"locked":false,"id":"shape-14","type":"rectangle","seed":1063,"x":30,"y":1082.6,"width":589.00792,"height":106.2,"customData":{"revealStep":8}},{"angle":0,"strokeColor":"#394557","backgroundColor":"transparent","fillStyle":"solid","strokeWidth":1.5,"strokeStyle":"solid","roughness":0.7,"opacity":100,"version":1,"versionNonce":1,"isDeleted":false,"groupIds":["step-8"],"frameId":null,"roundness":null,"boundElements":null,"updated":0,"link":null,"locked":false,"id":"shape-15","type":"text","seed":1136,"x":50,"y":1100.6,"width":549.00792,"height":70.2,"fontSize":18,"fontFamily":1,"text":"Recommendation:\nBinary files → Conflict Copy (Strategy 2)\nText/structured → Attempt auto-merge, fall back to copy","originalText":"Recommendation:\nBinary files → Conflict Copy (Strategy 2)\nText/structured → Attempt auto-merge, fall back to copy","textAlign":"left","verticalAlign":"middle","containerId":"shape-14","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":8}}],"appState":{"viewBackgroundColor":"#fbfbf8","gridSize":null},"files":{}}