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

Bug 355958

Summary:	Add / Add to Git Index not intuitive for merging conflicts
Product:	[Technology] EGit	Reporter:	Dani Megert <daniel_megert>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	NEW ---	QA Contact:
Severity:	normal
Priority:	P3	CC:	remy.suen
Version:	1.1
Target Milestone:	---
Hardware:	All
OS:	All
Whiteboard:

Description Dani Megert

2011-08-26 10:31:32 EDT

1.1.0.201108251914.

Add / Add to Git Index are not intuitive for merging conflicts.

I would expect something like 'Mark as Merged'. Actually I see this context menu item in the Synchronize view, but it is disable.