Vulkan 1.0.45 Released

[ldo17]

You can absolutely revision control document formats, and the concepts are in fact the entire basis for collaborative document editing systems (like google docs). The difference is that the application has to handle the revision control instead of external tools like git or diff.

Can Google Docs merge branches?

[Luke_Wolf]

Can Google Docs merge branches?

Google Docs is server-client so... no there's always a single document that you're sending changes to on the server, but with many of the same caveats as git surrounding merges it's an implementation detail to support such a thing. Basically all you have to do to make documents support version control is to consider the entire document to be a set of changes, with a cached state of the last action as the xml document file, potentially with some hash of the xml file stored in the version control file, that if it doesn't match you just replay the changes to get back to the current state. To merge you unroll to where it branched and replay the changes, prompting for manual merging as appropriate, updating the change metadata as necessary. This is what's necessary on a much smaller scale for concurrent collaborative editing.

[ldo17]

... no ...

So much for “you can absolutely revision control document formats”, then.

[Luke_Wolf]

So much for “you can absolutely revision control document formats”, then.

A server client platform doesn't have an implementation handle branches -> Document formats can't be revision controlled despite me explaining exactly how you can revision control documents, and explaining that merging branches is just a bigger version of concurrent collaborative editing, in that you need to consider more changes.

*smacks with a rolled up newspaper* I know your username says so, but don't be an idiot.

[ldo17]

A server client platform doesn't have an implementation handle branches ...

Really?? SVN can manage that much.