Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

Discarding changes doesn't abort merge

See original GitHub issue

Description

If you discard all changes in the middle of a conflicted merge, the changes are discarded but the merge is not aborted.

Version

GitHub Desktop: 1.4.0

Operating system: MacOS 10.13.6

Steps to Reproduce

merge-abort

Expected Behavior

git status is normal

Actual Behavior

git status says still merging screen shot 2018-09-20 at 2 41 36 pm

Additional Information

Issue Analytics

State:
Created 5 years ago
Comments:5 (5 by maintainers)

Top GitHub Comments

1reaction

iAmWillShepherdcommented, Sep 20, 2018

I think this is normal behavior of Git. I agree we should give the user the option to back out of a merge, but I don’t think discarding files should cancel a merge implicitly. Maybe we could add a context-button for cancelling a merge due to conflict?

cc @desktop/product @desktop/core

0reactions

outofambitcommented, Sep 21, 2018

fwiw this would develop some functionality we could reuse for the future abort merge flow

Top Results From Across the Web

I ran into a merge conflict. How do I abort the merge?

Beware that git revert means something very different to, say, svn revert - in Subversion the revert will discard your (uncommitted) changes ...

Git - Cancel Merge - Unfuddle Support

Use git-reset or git merge --abort to cancel a merge that had conflicts. # Reset all the changes back to the last commit....

How to discard your local changes in Git example

Git reset doesn't discard all local changes. The git reset –hard command will revert uncommitted changes that exist in files that have been ......

Undo changes in Git repository | PhpStorm Documentation

You can always undo the changes you've made locally before you commit them: ... All changes made to the selected files since the...

Chapter 29 Pull, but you have local work

You've introduced completely new files that don't exist in the remote branch and, therefore, cannot possibly have conflicting changes. You're in luck! You...