Better, simpler example of 'semantic conflict'?

Question

I like to distinguish three different types of conflict from a version control system (VCS):

• textual
• syntactic
• semantic

A

Answer 1

Check out the example in this post by Martin Fowler: http://martinfowler.com/bliki/SemanticConflict.html