Conflict handling is missing

[proski]

I was assuming that grive2 can handle conflicts when the same file has been changed both locally and remotely. I've just witnessed grive2 override my local changes because the remote file was changed as well. A quick look at the source found just one occurrence on the work "conflict":

// File is changed locally. TODO: Detect conflicts

Another confirmation that the conflicts are not handled is the lack of the both_changed state in Resource.hh. One possible conflict resolution strategy would be to download the remote file and to save it with a different name. That would give the user both revisions to allow the manual merge. In the meantime, I would appreciate a big warning in README.md that local changes are lost if there are remote changes.

[facundoq]

A similar thing happens with Mega's client; they don't do hashing or bookeeping, instead using the last modified date to decide which file to keep. This is really unacceptable and as @proski says, there should be a big warning message in readme.m

Also, what would it to implement this for grive2? If you're already checking md5 hashes to detect file differences, just moving the local file to .trash instead of deleting?