title: Egit - Cannot checkout now - stuck in rebase state
body: <p>I asked a similar question a few days ago, but I did not get a helpful answer, so I want to make everything more precise.</p>
  
  <p>I have a big project as a private repo on github. A friend of mine and me are currently working on it. I imported the whole repo into a local repository and into eclipse and everything went fine, until the merging conflicts came up. Everytime, I get a merging conflict (e.g. when I forget to pull before working on often used classes), the whole project in my eclipse workspaces switches into a state "Rebase w/merge":</p>
  
  <p><a href="https://i.stack.imgur.com/WHQhK.png" rel="noreferrer"><img src="https://i.stack.imgur.com/WHQhK.png" alt="Rebase w/merge state of the project"></a></p>
  
  <p>Now I get marks were the merge conflicts came up. So I opened the class to merge with the merge tool, edited everything I had to change and added the class to index again.</p>
  
  <p>Next, I commited all merging changes and pushed everything to the upstream into master-branch (we only use master so far, because we both do not have much experience with git and vcs/svn).</p>
  
  <p>But now, I neither can switch back to master branch, nor cancel rebase or do anything else.</p>
  
  <p>I tried:</p>
  
  <p>Rightclick on project folder -> Team -> Switch To -> master.
  <a href="https://i.stack.imgur.com/nWa9u.png" rel="noreferrer"><img src="https://i.stack.imgur.com/nWa9u.png" alt="Checkout fail"></a></p>
  
  <p>That is the error notification.</p>
  
  <p>Next I was told to cancel the rebase in Git Repositories View:</p>
  
  <p><a href="https://i.stack.imgur.com/zdxqX.png" rel="noreferrer"><img src="https://i.stack.imgur.com/zdxqX.png" alt="Git Repo View"></a></p>
  
  <p>But neither my local repo nor the remote one has any option related to rebasing.</p>
  
  <p>Next I tried "checkout" in the menu of the local branch. Same result.
  I also tried to push my local branch into the upstream:</p>
  
  <p><a href="https://i.stack.imgur.com/SeGfQ.png" rel="noreferrer"><img src="https://i.stack.imgur.com/SeGfQ.png" alt="enter image description here"></a></p>
  
  <p>This is my preset of the merge/rebase option, but both of those options bring up the same result:</p>
  
  <p><a href="https://i.stack.imgur.com/fPThS.png" rel="noreferrer"><img src="https://i.stack.imgur.com/fPThS.png" alt="enter image description here"></a></p>
  
  <p>I looked into my repo in github - all of my changes including the merge resolve are already pushed into the master branch and are ready to fetch. My teammate can pull them and can continue working on the project. But I cannot escape this Rebase w/merge state. Everytime this state came up, I had to delete all project resources, delete the local repository, re-import everything into eclipse and finally, I had to do every additional configuration over and over again.</p>
  
  <p>So: How can I escape this rebase? And btw: What is the difference between rebase and merging?</p>