It doesn't work because your changes conflict? How would anything else handle out of order modifications to files that cannot be resolved automatically? There w

It doesn't work because your changes conflict? How would anything else handle out of order modifications to files that cannot be resolved automatically? There will always been a requirement to do this manually - otherwise the VCS would be able to program for you (understand what is right/wrong).