Recommended and mentioned products
-
TortoiseGit is an easy to use client for the Git distributed revision control system.
-
Extension for Visual Studio - A set of extensions to Visual Studio 2012 Professional (and above) which improves developer productivity.
-
Free - GPL v2
You'd still have to jump to CLI to resolve conflicts, but it makes easy commits easier. http://rowanj.github.io/gitx/.