[Flow] Best practices for using Composer and Git Flow with Flow Applications

[Christian Loock]

Hello there,

I am currently trying to set-up a surf deployment for our application. I 
want to be able to deploy to three environments, a testing, staging and 
production environment. We use git flow for our versioning, and have 
composer for our flow packages. As with the default flow installation, 
we have a base distribution, that has it's own composer.json, that then 
references our packages. Now, for every branch (eg. master, develop and 
feature / release branches) I want to have an own composer.json file, 
that references to the corresponding branch of the packages.

For example, in the composer.json of the develop branch for the base 
distribution, I want all packages to be referenced by version 
dev-develop. You can just do this for every branch, but everytime you 
make an edit to your composer.json and merge branches, it will mess up 
(eg. overwriting version constraints etc.).

I wonder if there are any best practices or tricks for those scenarios. 
A nice case would be, if I could somehow have a seperate composer.json 
for every branch, that is never automatically merged. I have done some 
research on this, but I was not able to find a good solution for this 
problem.

I wonder, if anybody in this mailing list is running a comparable setup 
and could share how they do it.

Thank you very much.

-- 
Christian Loock
Web Developer
Renzel Agentur
www.renzel-agentur.de