Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 319844 - Reset should work in case of merge conflicts
Summary: Reset should work in case of merge conflicts
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC All
: P3 enhancement (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:51 EDT by Stefan Lay CLA
Modified: 2010-09-15 07:11 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: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 CLA 2010-09-15 07:11:42 EDT 
Fixed with 375f4c14888f793d859ce71482bacc8f96f00846