Description Jan Lohre 2011-06-29 05:53:53 EDT

Steps to reproduce:
1. Create two branches with conflicting commits
2. Cherry-Pick the commit from one branch to the other
-> You get notified that you have to resolve the conflict before continuing

With EGit in this state you can notice the following:
1. In the package explorer there is a Rebase Submenu with (Abort, Skip and Continue)
2. In the Repository view this submenue is not available
3. If you e.g. Abort EGit warns about wrong repo state "Cherry Pick"

I guess the action should not be available at all.