Your local changes to the following files would be overwritten by merge:
Your local changes to the following files would be overwritten by merge:
The following untracked working tree files would be overwritten by merge
配置1.工具--选项,默认PuTTY/Plink改为OpenSSH
去掉选中