Git Tip #1

So for all those times when you get merge conflicts and you just want to take what is in the remote repo, cause you know that it is the correct version (cause you messed you clone up beyond recognition):

git pull -X theirs <remote>

On the flip side, when you know that you local copy is correct:

git pull -X ours <remote>

Of course this also works for various other merge-related git commands, i.e. push, rebase (edit: avoid rebase, unless you know what you are doing, it behaves oddly), etc.