Solving conflicts in composer.lock
- November 28, 2016
We have all been there:
CONFLICT (content): Merge conflict in composer.lock Automatic merge failed; fix conflicts and then commit the result.
Don’t panic, breathe, let’s walk through this.
Read More