Bug 485150 - Provide an abort Merge action
Summary: Provide an abort Merge action
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords: usability
: 573179 (view as bug list)
Depends on: 363545
Blocks:
  Show dependency tree
 
Reported: 2016-01-04 10:14 EST by Sebastien Arod CLA
Modified: 2021-05-19 02:16 EDT (History)
4 users (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 Sebastien Arod CLA 2016-01-04 10:14:58 EST 
I known the documentation says that aborting a merge can be done using a hard reset. 

Still it would be more consistant with rebase behavior and more user friendly if the abort button were available in the git staging view during conflict resolution resulting from merge.
Comment 1 Georg Nepp CLA 2018-10-09 06:52:08 EDT 
Aborting a merge should use "git merge --abort".

With "git merge --abort" only changed files which are related to merge action will be reseted.

With "git reset --hard" all changed files, related file to merge action and changes files which are not related to merge action, will be reseted.
Comment 2 Marco Descher CLA 2020-09-22 05:27:26 EDT 
+1 on this
Comment 3 Thomas Wolf CLA 2021-04-27 03:32:48 EDT 
*** Bug 573179 has been marked as a duplicate of this bug. ***
Comment 4 Lars Vogel CLA 2021-04-27 04:35:11 EDT 
IIRC staging view already provides continue / abort for a running rebase with conflicts. Would be great to have this also for merge.
Comment 5 Lars Vogel CLA 2021-05-04 02:52:23 EDT 
A similar action would be great for a Cherry-pick with conflicts