[firebones]

>>>For that matter, I wish drop box was versioned. Same reason. It's always blown my mind that nobody has done a file system that was versioned so you could merge stuff. Maybe that's because BitKeeper merges so much better that the others. It's possible to automerge a lot more if you have the history.

https://en.wikipedia.org/wiki/Files-11

(A little facetious here...no merging, but come on, it was the 1980s.)

[luckydude]

VMS style versioning is not at all what I meant. What I meant is the OS implements the inode just like a versioned file in an SCM.

Consider the /etc stuff. You wack apache's config, so does debian, you do an apt-get upgrade and it either automerges or you get presented with the 3 way merge in $EDITOR or our graphical file merge.

In many cases, the system can just automerge it (BitKeeper has a pretty sophisticated way of doing, it's better than other answers in a lot of cases) and when it can't you get access to the full DAG and can use all the SCM tools to merge.