#Git Notes
##Resolve Merge conflicts using kdiff http://www.gitshah.com/2010/12/how-to-setup-kdiff-as-diff-tool-for-git.html
##Git cleanup local report after remote branches are deleted
git fetch remote --prune // deletes all branches that do not exist in the remo