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

Bug 318438

Summary:	Make merge available in EGit UI: 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:	jamesblackburn+eclipse, malaperle, robin, stefan.lay
Version:	unspecified
Target Milestone:	0.9.0-M3
Hardware:	All
OS:	All
Whiteboard:
Bug Depends on:
Bug Blocks:	303404

Description Matthias Sohn

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

2010-06-30 07:03:26 EDT

we plan to implement this in 0.9.0-M1

Comment 2 Stefan Lay

2010-09-15 07:13:21 EDT

Fixed with 0.9.1