title: EGit Pull, Push, Merge, not working
body: <p>After pulling updates to a project I am working on with some partners, Eclipse Git is not allowing me to continue pushing, pulling or merging.</p>
  
  <p>When I last pulled the updates, there were conflicts in the <code>web.xml</code>, so I deleted the conflicting text and saved just the correct one. However, Eclipse is continuing to show the double-diamond icon on the <code>web.xml</code> file, indicating there are conflicts. When I try to pull again, I get:</p>
  
  <pre><code>Cannot pull into a repository with state: MERGING
  org.eclipse.jgit.api.errors.WrongRepositoryStateException
  </code></pre>
  
  <p><img src="https://i.stack.imgur.com/gaBBZ.jpg" alt="Git State Merging"></p>
  
  <p>When I try to push my own commit I get</p>
  
  <p><img src="https://i.stack.imgur.com/mAok5.jpg" alt="Git Push Commit Error Screenshot"></p>
  
  <p>This is what it looks like in the History view</p>
  
  <p><img src="https://i.stack.imgur.com/Ev4vL.jpg" alt="Git History"></p>
  
  <p>How do I solve these issues and sucessfully push my commit?</p>