title: How to make a Git merge operation ignore identical changes made to both branches?
body: <p>Lets assume that we have one development branch 'A', and two sub branches 'B1' and 'B2', (both taken from A). Lets say that you run a <em>format code command</em> (in our case ReSharper's cleanup code) on the entire project in B1 and B2.</p>
  
  <p>Now, when we try to merge B2 into B1, Git will report conflicts on <em>all files</em> in the project (quite a large number in our case). When looking closer at each conflict, it seems like Git thinks theres a conflict even though the exact same change was made in both B1 and B2(?)</p>
  
  <p>Is there a way, custom driver/git attribute etc that will make a Git merge operation not report a conflict if the files in B1 and B2 are exactly the same?</p>
  
  <p>Maybe I've got it wrong, maybe it is a whitespace/line ending issue (eg different line endings in B1 and B2) in which case I can find the solution here on stack overflow.</p>