reported error code 1 when it ended: error: Your local changes to the following files would be overwritten by merge: app.js Please commit your changes or stash them before you merge. Aborting code example

Example: reported error code “1” when it ended: error: Your local changes to the following files would be overwritten by merge: composer.lock Please commit your changes or stash them before you merge. Aborting

git reset --hard
git pull