Composerphp

Solving conflicts in composer.lock

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
Deploying a Symfony2 and Composer app on PagodaBox

Deploying a Symfony2 and Composer app on PagodaBox

  • April 16, 2012

I have been working on a little pet project and wanted to put it up somewhere to show to a few people how it was going. I wanted something really simple so I decided to give the PHP PaaS solutions a try. Its a very simple Symfony 2.1 based app using Composer for vendor management, so I went on a quest to see what could be done and how.

Read More