Committing after doing a pull for remote files - got an error the first time