Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 318438 - Make merge available in EGit UI: conflict free case
Summary: Make merge available in EGit UI: conflict free case
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 enhancement (vote)
Target Milestone: 0.9.0-M3   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 303404
  Show dependency tree
 
Reported: 2010-06-30 07:02 EDT by Matthias Sohn CLA
Modified: 2010-09-15 07:13 EDT (History)
4 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-06-30 07:02:40 EDT 
As the next step towards full merge support we need to make conflict free merge available
Comment 1 Matthias Sohn CLA 2010-06-30 07:03:26 EDT 
we plan to implement this in 0.9.0-M1
Comment 2 Stefan Lay CLA 2010-09-15 07:13:21 EDT 
Fixed with 0.9.1