Setup SourceTree
While one can use the GIT command line or the build-in GIT support in the IDE, many developers prefer using a dedicated GIT client, that makes merging and conflict resolution easier.
This page describes the setup of SourceTree on Windows, which has its own little quirks.