== Rental == This scenario describes a couple of methods modified concurrently by two developers, and also moved to a different location by one of them. * Developer 1: * Renames and moves the method 'amountFor'. * Modifies the method 'statement'. * Developer 2: * Modifies the same methods 'amountFor' and 'statement'. For the method 'amountFor': * A traditional text-based merge tool will have trouble detecting the conflict. * SemanticMerge knows how to parse the PHP code and then can match the modified declaration independently of its location. For the function 'statement': * 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.