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.