title: Eclipse Repository State Conflict Error
body: <p>When my partner attempts to commit his update to BitBucket, he comes across the following error:</p>
  
  <pre><code>Repository State: Conflicts
  </code></pre>
  
  <p>The IDE does not tell us any further details about the conflicts and does not mark any issues in his code. </p>
  
  <p>What is going on and how can we fix this?</p>