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

Bug 319844

Summary:	Reset should work in case of merge conflicts
Product:	[Technology] EGit	Reporter:	Stefan Lay <stefan.lay>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	RESOLVED FIXED	QA Contact:
Severity:	enhancement
Priority:	P3	CC:	matthias.sohn
Version:	unspecified
Target Milestone:	---
Hardware:	PC
OS:	All
Whiteboard:
Bug Depends on:
Bug Blocks:	303404

Description Stefan Lay

2010-07-14 08:51:41 EDT

Currently a merge can not be abandoned with reset when there is a conflict.

The reason is that the reset operation works with the deprecated GitIndex that cannot handle more than one stage.

Comment 1 Stefan Lay

2010-09-15 07:11:42 EDT

Fixed with 375f4c14888f793d859ce71482bacc8f96f00846