can anyone tell the difference, I know that
--hard
option reset all three trees and
--merge
option is "safer". but I tried it, and lost uncommitted changes anyway. Can you provide some detailed examples, that shows advantages of
git reset --merge
this explanation doc from git-scm, doesn't make sense to me)
--merge Resets the index and updates the files in the working tree that are different between and HEAD, but keeps those which are different between the index and working tree (i.e. which have changes which have not been added). If a file that is different between and the index has unstaged changes, reset is aborted.
