checking in changes that were on the server that had not been committed to git