Thanks for your answer but I think that my question was not clear enough. I was talking about merge conflict detection... in source code. Often detected with a

Thanks for your answer but I think that my question was not clear enough. I was talking about merge conflict detection... in source code. Often detected with a tool like git, mercurial, subversion, etc.