{"type":"excalidraw","version":2,"source":"https://AwesomeSystemDesign.dev","elements":[{"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-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":16,"y":16,"width":288,"height":121.8,"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":36,"y":34,"width":248,"height":85.8,"fontSize":22,"fontFamily":1,"text":"Conflict Scenario:\nSame file edited on\ntwo offline devices","originalText":"Conflict Scenario:\nSame file edited on\ntwo offline devices","textAlign":"left","verticalAlign":"middle","containerId":"shape-0","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":1}},{"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-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":16,"y":181.8,"width":288,"height":493.6,"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":36,"y":199.8,"width":248,"height":457.6,"fontSize":22,"fontFamily":1,"text":"Timeline:\nT0: File \"doc.txt\" is\nv5 on all devices\nT1: Device A goes\noffline, edits doc.txt\n→ local v6a\nT2: Device B goes\noffline, edits doc.txt\n→ local v6b\nT3: Device A comes\nonline → uploads v6a\n→ server accepts as\nv6\nT4: Device B comes\nonline → uploads v6b →\nCONFLICT!","originalText":"Timeline:\nT0: File \"doc.txt\" is\nv5 on all devices\nT1: Device A goes\noffline, edits doc.txt\n→ local v6a\nT2: Device B goes\noffline, edits doc.txt\n→ local v6b\nT3: Device A comes\nonline → uploads v6a\n→ server accepts as\nv6\nT4: Device B comes\nonline → uploads v6b →\nCONFLICT!","textAlign":"left","verticalAlign":"middle","containerId":"shape-2","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":2}},{"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-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":16,"y":719.4000000000001,"width":288,"height":322,"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":36,"y":737.4000000000001,"width":248,"height":286,"fontSize":22,"fontFamily":1,"text":"Detection:\nDevice B: \"I'm\nuploading based on\nv5\"\nServer: \"Current\nversion is v6 (from\nDevice A)\"\nBase version\nmismatch →\nCONFLICT","originalText":"Detection:\nDevice B: \"I'm\nuploading based on\nv5\"\nServer: \"Current\nversion is v6 (from\nDevice A)\"\nBase version\nmismatch →\nCONFLICT","textAlign":"left","verticalAlign":"middle","containerId":"shape-4","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":3}},{"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-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":16,"y":1085.4,"width":288,"height":93.2,"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":36,"y":1103.4,"width":248,"height":57.2,"fontSize":22,"fontFamily":1,"text":"Resolution\nstrategies:","originalText":"Resolution\nstrategies:","textAlign":"left","verticalAlign":"middle","containerId":"shape-6","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":4}},{"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-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":16,"y":1222.6000000000001,"width":288,"height":379.2,"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":36,"y":1240.6000000000001,"width":248,"height":343.2,"fontSize":22,"fontFamily":1,"text":"Strategy 1:\nLast-Writer-Wins\n(simplest, data loss\nrisk)\n→ Server accepts\nv6b, overwrites v6a\n→ v6a saved as a\nversion in history\n(recoverable)\n❌ Alice's changes may\nbe silently \"lost\"\n(only in history)","originalText":"Strategy 1:\nLast-Writer-Wins\n(simplest, data loss\nrisk)\n→ Server accepts\nv6b, overwrites v6a\n→ v6a saved as a\nversion in history\n(recoverable)\n❌ Alice's changes may\nbe silently \"lost\"\n(only in history)","textAlign":"left","verticalAlign":"middle","containerId":"shape-8","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":5}},{"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-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":16,"y":1645.8000000000002,"width":288,"height":436.40000000000003,"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":36,"y":1663.8000000000002,"width":248,"height":400.40000000000003,"fontSize":22,"fontFamily":1,"text":"Strategy 2: Conflict\nCopy (Dropbox\napproach) ✅\n→ Server keeps v6\n(Device A's version)\n→ Creates \"doc\n(conflicted copy -\nDevice B).txt\" with\nv6b\n→ User manually\nmerges or picks the\nright version\n→ No data loss; user\ndecides","originalText":"Strategy 2: Conflict\nCopy (Dropbox\napproach) ✅\n→ Server keeps v6\n(Device A's version)\n→ Creates \"doc\n(conflicted copy -\nDevice B).txt\" with\nv6b\n→ User manually\nmerges or picks the\nright version\n→ No data loss; user\ndecides","textAlign":"left","verticalAlign":"middle","containerId":"shape-10","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":6}},{"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-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":16,"y":2126.2000000000003,"width":288,"height":493.6,"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":36,"y":2144.2000000000003,"width":248,"height":457.6,"fontSize":22,"fontFamily":1,"text":"Strategy 3:\nAutomatic Merge (for\ntext/structured\nfiles)\n→ Three-way merge:\nbase(v5), ours(v6a),\ntheirs(v6b)\n→ If changes in\ndifferent sections →\nauto-merge\n→ If changes in same\nsection → conflict\nmarkers (like git)\n→ Best for code,\ndocuments; not for\nbinary files","originalText":"Strategy 3:\nAutomatic Merge (for\ntext/structured\nfiles)\n→ Three-way merge:\nbase(v5), ours(v6a),\ntheirs(v6b)\n→ If changes in\ndifferent sections →\nauto-merge\n→ If changes in same\nsection → conflict\nmarkers (like git)\n→ Best for code,\ndocuments; not for\nbinary files","textAlign":"left","verticalAlign":"middle","containerId":"shape-12","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":7}},{"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-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":16,"y":2663.8,"width":288,"height":207.6,"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":36,"y":2681.8,"width":248,"height":171.6,"fontSize":22,"fontFamily":1,"text":"Recommendation:\nBinary files → Conflict\nCopy (Strategy 2)\nText/structured →\nAttempt auto-merge,\nfall back to copy","originalText":"Recommendation:\nBinary files → Conflict\nCopy (Strategy 2)\nText/structured →\nAttempt auto-merge,\nfall back to copy","textAlign":"left","verticalAlign":"middle","containerId":"shape-14","lineHeight":1.3,"autoResize":false,"customData":{"revealStep":8}}],"appState":{"viewBackgroundColor":"#fbfbf8","gridSize":null},"files":{}}