title: git pull options to prevent merge conflicts
body: <p>Is there an option(s) when doing <code>git pull</code> that will not allow any possibility of a merge conflict? I've looked at the <a href="https://www.kernel.org/pub/software/scm/git/docs/v1.6.4.1/git-merge.html#_merge_strategies" rel="noreferrer">merge strategies</a> but none seem to meet this description. I'm looking for an option like <code>git pull --quit_if_possible_merge</code> </p>
  
  <p>Basically, want a command for pulling to production site without any risk of a merge conflict which would temporarily bring the site down while we resolve it.</p>