TortoiseGit进行squash后冲突，如何撤销

还没有commit之前，需要撤销。

最暴力的，直接用git reset --hard HEAD

How to undo a git merge squash?

If you run git merge --squash <other-branch> the working tree and index are updated with what the result of the merge would be, but it doesn't create the commit. All you need to do is to run:

git commit

However, if you change your mind before committing and just want to abort the merge, you can simply run:

git reset --merge

You don't need to use the reflog.