title: Which file is mine vs theirs when using git merge?
body: <p>As an ex SVN user, how do I tell git I want mine or theirs? Head and MERGE HEAD do not make any sense to me. I want the version I am pulling from the server to overwrite the one on my computer is that HEAD or MERGE HEAD?</p>