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

Bug 335138

Summary:	Create a merge view to assist in conflict resolution
Product:	[Technology] EGit	Reporter:	Bernard Leach <leachbj>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	CLOSED DUPLICATE	QA Contact:
Severity:	enhancement
Priority:	P3	CC:	mathias.kinzler, pwebster, remy.suen, robin.rosenberg, tfletche
Version:	0.11
Target Milestone:	---
Hardware:	All
OS:	All
Whiteboard:

Description Bernard Leach

2011-01-23 20:12:39 EST

The process of identifying the set of changed files (and resolving conflicts) with egit is somewhat cumbersome.

Mecurial uses a 'merge view' which shows the list of resources that have been affected by the merge showing their merge status (Resolved/Unresolved) with the unresolved entries being highlighted.

The context menu on a resource lets you change the state (Mark as Resolved, Mark as Unresolved), show history, open in compare editor, open in merge editor (which shows current version and the version being merged) and abort merge.

Comment 1 Mathias Kinzler

2011-01-27 08:18:18 EST

Hi Bernard,
did you already come across the Team->Merge Tool menu action? This is only active if the repository hosting the currently selected resource is in a merging state.
You might also want to check

http://wiki.eclipse.org/EGit/User_Guide#Merging

If these don't address your issue, please let us know.

Comment 2 Bernard Leach

2011-01-27 18:35:09 EST

Yes, I've seen the merge tool menu.

What I'm really looking for is a simple way to review large merges, locate the various conflicts and then resolve them.

The annotations are difficult to use as that requires digging down the various source trees to find the actual files or using the merge tool on the directory tree and resolving the conflicts in that order.

A table view showing all files that were modified as a result of the merge (basically a 'git status') would allow me to quickly look at all the changes which can be useful in order to determine exactly how to proceed with resolving merge conflicts.

Perhaps the actual view should simply be a 'git status' view?  (That would also be a great place to add unstage functionality!)

Comment 3 Bernard Leach

2011-02-03 17:33:48 EST

The latest build (201102031130) almost does it.  When you run mergetool you now get a 'Structure Compare' which shows a list of resources that have been modified and have conflicts.

Unfortunately there are no decorations on the files (so its not clear which ones are conflicts versus just modified or even which files have already been staged) and you cannot stage files from the view (or open the file or link to the navigator view so as to access the resource based menu).

Comment 4 Robin Rosenberg

2011-04-06 15:24:32 EDT

I think it would be good to have conflicts in the problems view too.

Comment 5 Bernard Leach

2011-05-05 01:19:59 EDT

The staging view will satisfy this requirement so closing as a duplicate.

*** This bug has been marked as a duplicate of bug 313263 ***