Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 319843 - Reset does not reset repository state "Merged"
Summary: Reset does not reset repository state "Merged"
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 303404
  Show dependency tree
 
Reported: 2010-07-14 08:49 EDT by Stefan Lay CLA
Modified: 2010-09-02 11:23 EDT (History)
1 user (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Stefan Lay CLA 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 CLA 2010-09-02 11:23:58 EDT 
Fixed with 375f4c14888f793d859ce71482bacc8f96f00846