title: Multiple common ancestors were found and merging them resulted in a conflict
body: <p>I am performing salesforce deployments. The current setup is:</p>
  
  <ol>
  <li><strong>Dev</strong> org is pushed from <strong>develop1</strong> branch.</li>
  <li><strong>UAT</strong> org is pushed from <strong>UAT1</strong> branch.</li>
  </ol>
  
  <p>Every 2 weeks we do a <strong>Mergeback</strong> of <strong>UAT1 into develop1</strong>. Which is later deployed onto the dev org. </p>
  
  <p>This has been working for me until now. Currently I have been continuously seeing below error while merging in eclipse:</p>
  
  <pre><code>**"Multiple common ancestors were found and merging them resulted in a 
  conflict"**
  </code></pre>
  
  <p>I tried using Eclipse Neon/Mars with Egit 4.*. I am unable to carry out the merge activity and resolve the conflicts. </p>
  
  <p>Based on the answers in the below question:</p>
  
  <p><a href="https://stackoverflow.com/questions/12223439/how-to-work-around-multiple-merge-bases-error-in-egit-eclipse-plugin">How to work around &quot;multiple merge bases&quot; error in EGit Eclipse plugin?</a></p>
  
  <p>I do not want to go about the cherry picking of the merge activity since It will be a very cumbersome task. </p>
  
  <p>Is there another tool which can handle this? I have installed sourcetree, but I am not sure if this would help.</p>