Doing merges in git
One of the things that some people fear in a distributed source control is that they might run into conflicts all the time.
My experience has shown that this isn’t the case, but even when it is, there isn’t really anything really scary about that.
Here is an example of a merge conflict in Git:
Double click the conflicting file, and you get the standard diff dialog. You can then resolve the conflict, and then you are done.