История изменений

делай пуш на сервер, вместо pull с сервера.

git умеет это с некоторых пор.

https://github.com/blog/1994-git-2-4-atomic-pushes-push-to-deploy-and-more

Git 2.4 improves push-to-deploy in two ways:

There is now a push-to-checkout hook, which can be installed on the server to customize exactly what happens when a user pushes to the checked-out branch. For example, by default such a push fails if there have been any changes to the working tree on the server. The push-to-checkout hook could instead try to merge any server-side edits with the new branch contents, or it could unconditionally overwrite any local changes with a pristine copy of the pushed branch contents. [source]

Push-to-deploy formerly didn't work correctly when pushing to a server that is on an «unborn branch». (An «unborn branch» is what Git calls a branch that doesn't yet have any commits on it, as for example immediately after a Git repository is initialized.) Now this works as expected, which will hopefully reduce confusion for users who are trying to set up push-to-deploy for a new project. [source]

делай пуш на сервер, вместо pull с сервера.

git умеет это с некоторых пор.

https://github.com/blog/1994-git-2-4-atomic-pushes-push-to-deploy-and-more

Git 2.4 improves push-to-deploy in two ways:

There is now a push-to-checkout hook, which can be installed on the server to customize exactly what happens when a user pushes to the checked-out branch. For example, by default such a push fails if there have been any changes to the working tree on the server. The push-to-checkout hook could instead try to merge any server-side edits with the new branch contents, or it could unconditionally overwrite any local changes with a pristine copy of the pushed branch contents. [source]

Push-to-deploy formerly didn't work correctly when pushing to a server that is on an «unborn branch». (An «unborn branch» is what Git calls a branch that doesn't yet have any commits on it, as for example immediately after a Git repository is initialized.) Now this works as expected, which will hopefully reduce confusion for users who are trying to set up push-to-deploy for a new project. [source]