== Date == This scenario describes a couple of functions modified concurrently by two developers, and also moved to a different location by one of them. * Developer 1: * Renames and moves the function 'print'. * Modifies the function 'main'. * Developer 2: * Modifies the same functions 'print' and 'main'. For the function 'print': * A traditional text-based merge tool will have trouble detecting the conflict. * SemanticMerge knows how to parse the C++ code and then can match the modified declaration independently of its location. For the function 'main': * A traditional text-based merge tool will come up with a very similar result, but we think Semantic does a much better job highlighting the changes. Check the "Visual Merge" to obtain a better understanding of the scenario.