Every SCM that exists will fail spectacularly at merging two refactorings that touched the same code. You simply can't solve this with software today. Same cod

Every SCM that exists will fail spectacularly at merging two refactorings that touched the same code. You simply can't solve this with software today. Same code is not supposed to be refactored twice. If it happens, a human with knowledge of the two refactors must resolve the conflict. If there's a line of code which has been touched twice in two different refactoring efforts, I dont think its a good idea to let machine decide between them. Unless, machine knows the exact purpose of the code. If we get to that point, I think machines will be able to write programs themselves :)