Join the Mailing List
Locking the main branches in order to use merge requestsPublished by Fiammybe on 2013/6/24 (1181 reads)
We will be locking the main branches for ImpressCMS 1.3 (in SVN) and ImpressCMS 2.0 (in Git) again. From now on, no more development will be directly accepted in the main branch, you'll need to use a task branch to develop your change, and use a merge request to get it included in the core.
I talked about merge requests in my older post about using the tools Assembla gives us. This way of developing in a separate task branch was already the rule for ImpressCMS development (as described in the wiki), but it wasn't really enforced anywhere.
Now that Assembla gives us the tools to make this easy to work with, it would be a pity if we didn't.
The benefits of using merge requests were described in this forum post by skenow. Basically, it gives the release managers more control over the code, and it allows developers to each work in their own environment, without interfering with each other's changes.