== Simple ==
This scenario shows two basic conflicts:
1- A changed-changed conflict.
2- A changed-deleted conflict.

These are the steps that two developers followed to create the conflict during the merge:

* Developer 1:
    * Modifies the functions 'callbackKeyCompare' and 'redisAsyncCommandArgv'.

* Developer 2:
    * Modifies the function 'callbackKeyCompare' and deletes the function 'redisAsyncCommandArgv'.

In this case, 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.