Bug 562644

Summary:	3-column 3-way compare with baselines on each side and working copy in the center
Product:	[Eclipse Project] Platform	Reporter:	Mickael Istria <mistria>
Component:	Team	Assignee:	Platform Team Inbox <platform-team-inbox>
Status:	NEW ---	QA Contact:
Severity:	enhancement
Priority:	P3	Keywords:	usability
Version:	4.16
Target Milestone:	---
Hardware:	All
OS:	All
Whiteboard:

Description Mickael Istria

2020-04-30 04:18:03 EDT

When dealing with conflicts during a merge, the current compare editor is complex because it fails at highlighting user what are the proposals from the 2 conflicting versions and what's the working copy.
What user typically expect is something like https://www.lifehacker.com.au/2018/09/sublime-merge-is-a-slick-git-front-end-from-the-makers-of-sublime-text/ , with a 3-columns viewer, each side showing one of the conflicting state and the editable center column showing the merged version.

The current approach to 3 way compare in the compare editor is not a viable solution for such case at the moment, although it probably has a lot of code that would be relevant in implementing a 3-columns merge.