tortoisegit安装
1.下载tortoisegit：https://tortoisegit.org/download/2.下...
Your local changes to the following files would be overwritten by merge:
在服务器改动之后，用sourcetree提交会产生冲突，解决办法：
If you did this already, delete the swap file ".git/.MERGE_MSG.swp"
出现这种情况一般是不正常退出造成的，找到隐藏文件后删除解...