title: How to automatically resolve multiple git conflicts under some path?
body: <p>When merging branch Source into Target, I get ~1K conflicts and I've noticed the following:</p>
  <ol>
  <li>All conflicted files under path MyRepo\SomeFolder\A\ should be picked from Source branch. E.g. &quot;MyRepo\SomeFolder\A\File1.txt, MyRepo\SomeFolder\A\File2.script&quot;</li>
  <li>All conflicted files under path MyRepo\SomeFolder\B\ should be picked from Target branch. E.g. &quot;MyRepo\SomeFolder\B\File3.csproj, MyRepo\SomeFolder\B\File4.txt&quot;</li>
  <li>Small number of files from other paths should be manually resolved by picking fractions of code from both Source and Target.</li>
  </ol>
  <p>Bullet 3 I can resolve manually. The number of conflicts in buckets 1. and 2. is huge. Is there a way to run a batch script/command that can resolve all the conflicts in 1/2?</p>
  <p>Something like (pseudocode):</p>
  <pre><code>Foreach file in path
      if file is conflicted/ contains '&lt;&lt;&lt;&lt;'
         pick it from Source and resolve that conflict(or Target, depending on scenario 1 or 2)
  </code></pre>
  <p>Also, if there's a gui doing this, that would be even better, but I'm sure I'm asking too much :)</p>