Building the tech isn’t the problem; getting 90% of Internet users to adopt it is.
And yes, locking unmergeable files is essential either way.
It isn't great that are now so many Git GUI clients written in Electron?
The new Flash is a whole other pair pants. Also if people want to make easy things for the web in a closed platform, Unity already exists.