Peter Stuifzand Notes on software, small tools, and the open web.
08:44

Resolving composer merge conflicts | Theodo

Bookmarked blog.theodo.com/2013/03/resolving-composer-merge-conflicts

Explains strategy for working through merge conflicts in composer.lock

Peter Stuifzand