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

Bug 364851

Summary:	[Compare]Support 3-way compare.
Product:	[ECD] Orion	Reporter:	libing wang <libingw>
Component:	Client	Assignee:	libing wang <libingw>
Status:	RESOLVED WONTFIX	QA Contact:
Severity:	normal
Priority:	P3	CC:	evan_hughes, john.arthorne, simon_kaegi
Version:	0.3
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:
Bug Depends on:	344286
Bug Blocks:	339045

Description libing wang

2011-11-25 10:54:42 EST

We need a 3-way compare widget on the client side to support 3-way compare.
The design approach is to have the existing 2-way compare widget sitting in the bottom and an editor component sitting above for the common ancestor.
The 2-way compare widget will work the same as it is, while the common ancestor is highlighted with appropriate block where the conflicts happens.

Comment 1 Evan Hughes

2011-11-25 11:01:41 EST

The Jazz team is really looking forward to this. See https://jazz.net/jazz/resource/itemName/com.ibm.team.workitem.WorkItem/182066.

Comment 2 libing wang

2011-11-29 09:57:31 EST

Evan and I already put some efforts on making the current 2-way compare consumable by Jazz team.
We have no plan to support 3-way compare in 0.4 plan.

Comment 3 John Arthorne

2015-05-05 14:44:45 EDT

Closing as part of a mass clean up of inactive bugs. Please reopen if this problem still occurs or is relevant to you. For more details see:

https://dev.eclipse.org/mhonarc/lists/orion-dev/msg03444.html