1.在IDEA中进行分支切换时，出现如此错误，导致无法正常切换：
error: The following untracked working tree files would be overwritten by checkout
解决方法：git clean -d -fx
2.merge导致冲突时或是不想提交代码了，导致无法正常PUSH：
Pull is not possible because you have unmerged files.
解决方法：
git log
git reset --hard FETCH_HEAD
