Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

Wonder how good this is at resolving merge conflicts:

> Offline? No problem, keep writing, your edits will get synced when back online

Have been burned too many times in college.

person 1: is updating doc

person 2: is updating doc

person 3; updating doc

(( doc reaches a dozen pages ))

person 3 loses internet connection but everyone else continues working

Person 3 adds and edits a handful of pages while offline while #1, #2 keep chugging along.

#3 internet is restored and now the system attempts to merge in their changes and sync changes from #1, #2. At the same time, #1, #2 receiving updates from #3

Now chaos ensues as the system is throwing a shit ton of errors and old changes getting reverted. Immediate showstopper.

Not so fun times. And a lesson learned.



Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: