windows編譯的二進制文件, 阿里云git pull提示要合并
我用windows編譯? GOOS=linux GOARCH=amd64 go build -o webserver 然后git push, git commit到github.
在阿里云上的deploy.sh運行出錯, git pull后提示:
error: Your local changes to the following files would be overwritten by merge:
? ? ? ? ?webserver/webserver
Please commit your changes or stash them before you merge.
2017-12-25
解決了, 修改deploy.sh的git pull前面增加 git reset --hard