title: Does the order of Git merging matter?
body: <p>Suppose I have two branches, <code>A</code> and <code>B</code>.  Do the following properties hold?</p>
  
  <ul>
  <li>Merging <code>A</code> into <code>B</code> conflicts if and only if merging <code>B</code> into <code>A</code> conflicts.</li>
  <li>The contents of my files after merging <code>A</code> into <code>B</code> is the same as the contents of my files after merging <code>B</code> into <code>A</code>.</li>
  </ul>