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

Bug 328217

Summary:	implement rebase - support conflict-free case
Product:	[Technology] JGit	Reporter:	Matthias Sohn <matthias.sohn>
Component:	JGit	Assignee:	Mathias Kinzler <mathias.kinzler>
Status:	RESOLVED FIXED	QA Contact:
Severity:	enhancement
Priority:	P3	CC:	angvoz.dev, caniszczyk, mathias.kinzler
Version:	0.10.0	Keywords:	noteworthy
Target Milestone:	0.10.0-M2
Hardware:	All
OS:	All
Whiteboard:
Bug Depends on:
Bug Blocks:	328216, 328219

Description Matthias Sohn

2010-10-20 04:44:44 EDT

As a first stage we want to implement basic rebase only supporting the conflict-free case.
If a conflict is detected during rebase, all changes shall be rolled back to the state before the rebase operation.

Comment 1 Mathias Kinzler

2010-11-22 09:36:01 EST

Code review at http://egit.eclipse.org/r/#change,1864

Comment 2 Chris Aniszczyk

2010-11-22 11:46:53 EST

Pushed as e5b96a7848d680cf50123a44cbc147db91d798d3.

Thanks Matthias and everyone.