I agree with using SourceTree. I use the CLI for pretty much everything, but sometimes for reversals or complicated merges, I like to visually compare the difference between files to make sure I'm not going to screw something major up.

Started using Vim and couldn't stop. There are just so many useful plugins out there. I switched over from Sublime Text and now I can't go back.