title: Force Git to always choose the newer version during a merge?
body: <p>Let's assume I <code>merge</code> git and there is a merge conflict.</p>
  
  <p>My question is: how can I force git to always choose the newer version of code in conflict so I won't need to resolve the conflict by hand?</p>