title: Why do conflicts occur even after merging patches into the destination branch?
body: <p>My project has a <code>develop</code> and <code>production</code> branch. While the <code>develop</code> branch is ahead of <code>production</code> carrying new work, some patches have gone straight to <code>production</code>, having caused both branches to diverge.</p>
  <p>My incentive now is to pull in the patches from <code>production</code>, eradicating the merge conflicts between the branches, and making the next release possible.</p>
  <p>My steps:</p>
  <ol>
  <li>Created a new branch from <code>production</code></li>
  <li>Merged the changes from <code>develop</code> into my working branch, resolved all merge conflicts</li>
  <li>Merged my working branch into the <code>develop</code> branch</li>
  </ol>
  <p>When I now try to merge develop into <code>production</code>, new merge conflicts occur. Why is this happening?</p>