"Your local changes in the specified files will be overwritten when merging" - how to force overwrite?

Question

git

In the crown set to be executed:

cd /home/admin/pma/www && git pull -q origin STABLE && composer update --no-dev

to update phpMyAdmin. But for some reason an error popped up:

error: Your local changes to the specified files will be overwritten when merging:
composer.lock
Commit or stash your changes before merging branches.
interrupt

How to tell him to overwrite without questions? None of my local changes are there. Except config.inc.php

Answer 1

You need to do composer install, not update, so that it does not touch the .lock file.
And resetting Git with git reset --hard.
Or add composer.lock to .gitignore.