mozilla/makedrive — pull request #408 by gideonthomas (2014-10-12 19:28:07+00:00)
Title: [WIP] Fix #308 - Local fs should maintain conflicted copies appropriately

My first pass at this is fixing the conflicted copy generation problem (the part where it wasn't being generated when a client disconnects and connects again to the server which overwrites any changes made locally). Now, if there are local changes when the client is disconnected, then the client connects again, a conflicted copy is generated.