Bug 328217 - implement rebase - support conflict-free case
Summary: implement rebase - support conflict-free case
Status: RESOLVED FIXED
Alias: None
Product: JGit
Classification: Technology
Component: JGit (show other bugs)
Version: 0.10.0   Edit
Hardware: All All
: P3 enhancement (vote)
Target Milestone: 0.10.0-M2   Edit
Assignee: Mathias Kinzler CLA
QA Contact:
URL:
Whiteboard:
Keywords: noteworthy
Depends on:
Blocks: 328216 328219
  Show dependency tree
 
Reported: 2010-10-20 04:44 EDT by Matthias Sohn CLA
Modified: 2010-11-22 12:38 EST (History)
3 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Matthias Sohn CLA 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 CLA 2010-11-22 09:36:01 EST 
Code review at http://egit.eclipse.org/r/#change,1864
Comment 2 Chris Aniszczyk CLA 2010-11-22 11:46:53 EST 
Pushed as e5b96a7848d680cf50123a44cbc147db91d798d3.

Thanks Matthias and everyone.