You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
When in a merge conflict scenario, there are two ways of aborting the merge: merge --abort and reset HEAD --hard. Both leave the MERGE_MSG and ORIG_HEAD ref dangling, while they should be deleted.
When in a merge conflict scenario, there are two ways of aborting the merge:
merge --abortandreset HEAD --hard. Both leave theMERGE_MSGandORIG_HEADref dangling, while they should be deleted.