Some of the Windows information on Git from this article is outdated. I use TortoiseGit on Windows regularly. It handles all the common cases for me very well. For the uncommon cases, it comes packaged with Bash for Windows, so I can use Git easily from the command line as well.