Regarding merging: hard to say. Possibly, if you have the ability to check for conflicts with each file touch across machines, you could in theory resolve/ident

Regarding merging: hard to say. Possibly, if you have the ability to check for conflicts with each file touch across machines, you could in theory resolve/identify conflicts earlier. But that's a guess. The main premise was to remove the pain of git, and it's possible that, as you say, it's not a big enough pain point!