After making modifications on server ensure git repo has not changes

This is part of the Semicolon&Sons Code Diary - consisting of lessons learned on the job. You're in the git category.

Last Updated: 2021-05-15

I ssh-ed into a broken server and removed a misbehaving class in project_s. This caused a colleague's subsequent deploy (which depends on running git commands under the hood) to break since there were unexpected server-side merge conflicts.

Lesson

After modifying something on a server that receives its updates via git, ensure that its git repo is clean (i.e. that there are no uncommitted changes as a consequence of your actions on that machine). This might mean committing your changes there and pushing them to Github.