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

Re: [PATCH] refuse to merge during a merge

From: John Tapsell <hidden>
Date: 2016-06-15 22:46:53

"git reset --hard" is not suggested, because it potentially removes
changes unrelated to the merge (if the work tree was dirty prior to
the merge).
Sorry could you just clarify...  if the user does "git reset HEAD"
will that sometimes always or never fail?

If it sometimes or always fails, then doesn't it seem kinda confusing
if the user is told to run that command, but then when they do they
get an error?

John
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help