Title Tags
force git to always choose the newer version during a merge? - stack overflow
http://stackoverflow.com/questions/13594344/force-git-to-always-choose-the-newer ... 		git merge ours theirs (edit)