Earlier quoted context omitted.
Similar to git, but if you have multiple branches of the same file, display them visually and allow the user to merge just that file?
If people have to do anything it's not good enough.
Re: Google loses data as lightning strikes
#141Actually quite a lot of serious by non-power-users do want this. You only have to look at a random persons laptop and see and the file names with "final version.docx", "final version 2.docx" "final final version.docx" etc to see this. They certainly don't want a console based solution but a cross between git and word style track changes would make lots of people pretty happy.