Bug 393906

Summary:	add options from rebase menu to staging view during rebase
Product:	[Technology] EGit	Reporter:	Sam Davis <sam.davis>
Component:	UI	Assignee:	Matthias Sohn <matthias.sohn>
Status:	RESOLVED FIXED	QA Contact:
Severity:	enhancement
Priority:	P3	CC:	frank.jakop, matthias.sohn, robin.rosenberg, robin
Version:	unspecified	Keywords:	noteworthy
Target Milestone:	3.1
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Sam Davis

2012-11-08 12:47:13 EST

When resolving conflicts during a rebase, it would be really convenient to have the rebase continue, abort, and skip commands available in the staging view.

Comment 1 Robin Stocker

2012-11-08 14:12:24 EST

+1 This has also been on my todo list for EGit :)

Comment 2 Frank Jakop

2013-06-26 08:35:17 EDT

+1 also. The navigation via context menu is imho a blocker for using rebase.

Comment 3 Matthias Sohn

2013-08-29 07:58:53 EDT

*** Bug 414930 has been marked as a duplicate of this bug. ***

Comment 4 Matthias Sohn

2013-08-29 07:59:29 EDT

I started working on this

Comment 5 Robin Stocker

2013-09-18 10:47:08 EDT

Matthias' change was here: https://git.eclipse.org/r/#/c/16171/

Merged for 3.1: https://git.eclipse.org/c/egit/egit.git/commit/?id=e7c4cdb112614bd59e5e38a1412c627f740e811e

Comment 6 Robin Stocker

2013-09-18 10:52:23 EDT

Here's a screenshot of how it looks like: http://imgur.com/NbkrFjK