Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 350676

Summary: Rebase submenu is shown in cherry-pick conflicts state
Product: [Technology] EGit Reporter: Jan Lohre <jan.von.loewenstein>
Component: UIAssignee: Project Inbox <egit.ui-inbox>
Status: RESOLVED FIXED QA Contact:
Severity: trivial    
Priority: P3 CC: robin, stefan.lay
Version: 1.1   
Target Milestone: 3.2   
Hardware: PC   
OS: Windows 7   
Whiteboard:

Description Jan Lohre CLA 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.
Comment 1 Robin Stocker CLA 2013-09-29 15:37:25 EDT 
Proposed fix: https://git.eclipse.org/r/16863
Comment 2 Stefan Lay CLA 2013-10-01 03:14:06 EDT 
Fixed with 955190bbb351701cc2da7335ab2723991556e510