The following untracked working tree files would be overwritten by merge 保留远程服务器中的内容,覆盖本地的内容 git clean -d -fx git pull