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

Bug 319843

Summary:	Reset does not reset repository state "Merged"
Product:	[Technology] EGit	Reporter:	Stefan Lay <stefan.lay>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
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:49:19 EDT

I resolve a merge conflict on the command line. Then I do a hard reset in EGit to abort the merge.

This does not change the decorator on the project, it stays "Merged".

The reason seems to be that the files MERGE_HEAD and so on are not deleted in the .git folder.

Comment 1 Stefan Lay

2010-09-02 11:23:58 EDT

Fixed with 375f4c14888f793d859ce71482bacc8f96f00846