PHP Composer.lock Git conflicts

If you get a git conflict on composer.lock, ignore local changes and fetch the latest from Git. Then run a composer update and commit the updated lockfile to make sure it includes everything.

[credit]

Leave a Reply