title: How do you get a Git merge to ignore conflicts in selected files?
body: <p>I am merging a feature branch into the master branch and I want to overwrite some of the files in the master branch. The files I want to overwrite generally contain text configurations and some binary data encoded as text so they are bound to be problematic and I don't care about those anyway. They are intended to replace those in the master.</p>
  
  <pre><code>Auto-merging frmShopSupportIncidents.lfm
  CONFLICT (content): Merge conflict in frmShopSupportIncidents.lfm
  Auto-merging frmNewShop.lfm
  CONFLICT (content): Merge conflict in frmNewShop.lfm
  Auto-merging frmCliCustsBrowser.lfm
  CONFLICT (content): Merge conflict in frmCliCustsBrowser.lfm
  Auto-merging custManager.lpi
  Auto-merging clientShopFrame01.lfm
  CONFLICT (content): Merge conflict in clientShopFrame01.lfm
  Automatic merge failed; fix conflicts and then commit the result.
  </code></pre>
  
  <p>How do I get the conflicts to be ignored and overwritten any way?</p>