Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 328219 - Support rebase - conflict-free case
Summary: Support rebase - conflict-free case
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: 0.10.0   Edit
Hardware: All All
: P3 enhancement (vote)
Target Milestone: 0.10.0-M2   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on: 328217
Blocks:
  Show dependency tree
 
Reported: 2010-10-20 04:48 EDT by Matthias Sohn CLA
Modified: 2010-11-27 18:22 EST (History)
6 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: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 CLA 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 CLA 2010-11-27 18:22:51 EST 
merged as 1a15e432860bdb33fd975a9708a4a3e04c8e1c74