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

Bug 328219

Summary:	Support rebase - conflict-free case
Product:	[Technology] EGit	Reporter:	Matthias Sohn <matthias.sohn>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	RESOLVED FIXED	QA Contact:
Severity:	enhancement
Priority:	P3	CC:	angvoz.dev, christian.halstrick, christian.halstrick, marcus, mathias.kinzler, waste.manager
Version:	0.10.0
Target Milestone:	0.10.0-M2
Hardware:	All
OS:	All
Whiteboard:
Bug Depends on:	328217
Bug Blocks:

Description Matthias Sohn

2010-10-20 04:48:42 EDT

As first stage of rebase support we want to implement the conflict-free case. EGit needs to enhance the UI appropriately

Comment 1 Mathias Kinzler

2010-11-22 09:37:53 EST

I'm working on this but am still waiting with the code review until we have bug 328217 in.

Comment 2 Matthias Sohn

2010-11-27 18:22:51 EST

merged as 1a15e432860bdb33fd975a9708a4a3e04c8e1c74