title: Git resolve conflicts for all files on a path
body: <p>Can someone help me on what is the right command that I can use for resolve conflicts for all files under a specific path with --ours strategy? 
  I've tried so far: </p>
  
  <p><code>
  git checkout --ours public/
  git checkout --ours public/*
  </code> </p>
  
  <p>And all variants... </p>