Resolving composer.lock merge conflicts
13-10-2022 0:35 by Stefan
Development
For developers merging and rebasing git branches is rather straight forward most of the time, but it can get complex when dealing with PHP’s package manager Composer, and its lock file. In this blogpost I go over my workflow when encountering such a scenario.