Failed to deploy because of the composer.lock file

Hi.

git commit -m 'message'

or

git stash

and retry

How does git stash works? Should I do git add . git commit git stash or?

yes

git add .
git commit -m 'message'

git stash https://git-scm.com/docs/git-stash

@hjortur17 The error indicates that changes have been made to composer.lock on your server and that they would be overwritten by git pull. It's up to you to decide what should happen with those changes. You can commit or stash the file like @rin4ik suggested, but you can also reset the file to its original state in the repo by doing git checkout <filename-here> (basically undo the changes that were made to it). There's no use in commiting the changes if you don't intend to use them?

I really recommend you watch the Laracasts series on Git to learn the basics. It's not a good idea to just run git commands without understanding what they actually do. https://laracasts.com/series/git-me-some-version-control/episodes/8

No local changes to save - why? I was make-ing changes to my controller

git add . git commit -m "More readable controller" git stash push

No local changes to save

@hjortur17 On your server, not locally.