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

Bug 343595

Summary:	[sync] integrate merge tool into synchronize view
Product:	[Technology] EGit	Reporter:	Benjamin Muskalla <b.muskalla>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	RESOLVED FIXED	QA Contact:
Severity:	enhancement
Priority:	P3
Version:	unspecified
Target Milestone:	---
Hardware:	PC
OS:	Linux
Whiteboard:

Description Benjamin Muskalla

2011-04-21 13:21:38 EDT

We should try to come up with a workflow that allows merging of conflict inside the synchronize view.

Comment 1 Benjamin Muskalla

2011-07-14 07:50:17 EDT

Pushed change to http://egit.eclipse.org/r/#change,3876

Comment 2 Benjamin Muskalla

2011-07-19 16:42:59 EDT

This was merged with fbc1a75f682154c7e875d61b831d3fc29f49e3f1.