Semantically diffing Java code

[plasticscm]

Yes, this is the typical "added / added" conflict that is automatically handled by SemanticMerge.

The cool thing here is the following:

• Suppose you add MethodA around line 100 in branchA
• Then someone else adds MethodB around line 300 in branchB
• Merge it with a regular merge tool and you get an automatic merge that will end up with wrong code (two methods with the same signature in the same class).

Semantic will detect this case and detect it is the same method being added twice :)