== Socket ==
In this scenario a Socket class is refactored in parallel:

1. One developer creates a new ClientSocket class.
2. While a second one creates a new ServerSocket.

Methods are moved from the original class to the new ones. This is the type of merge where a traditional merge tool makes you hate refactor, but Semantic doesn't even bother you with conflicts!