Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: git merge --abort

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:46:15

John Tapsell [off-list ref] writes:
2009/2/20 Junio C Hamano [off-list ref]:
<snip>
quoted
   $ edit ;# unrelated local changes are still here
   $ git pull ;# or merge or whatever
   ... oops, large conflict ...
   ... look and see if it can easily be resolved ...
   ... otherwise
   $ git merge --abort
Can I just confirm - at this stage, "git merge --abort" would be a
"git reset --hard HEAD" ?
Not at all.  Please re-read my previous message that begins with "Not at
all".
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help