Make a Lasting Impression

Join the Mailing List

Who's Online

14 user(s) are online (1 user(s) are browsing News and Articles)

Members: 0
Guests: 14

more...
ImpressCMS proudly uses SourceForge
ImpressCMS on Ohloh.net
News and Articles > ImpressCMS Community News > ImpressCMS Development > Locking the main branches in order to use merge requests

Locking the main branches in order to use merge requests

Published by Fiammybe on 2013/6/24 (591 reads)
Locking the main branches in order to use merge requests

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.


Navigate through the articles
Previous article PhpStorm 7 is now available Navigating ahead - ImpressCMS Compass 2012 Next article
The comments are owned by the poster. We aren't responsible for their content.
Poster Thread
Will
Posted: 2013/7/2 14:10  Updated: 2013/7/2 14:10
Home away from home
Joined: 2007/12/4
From: Dallas, TX
Posts: 3556
 Re: Locking the main branches in order to use merge reque...
skenow
Posted: 2013/7/7 3:14  Updated: 2013/7/7 3:14
Home away from home
Joined: 2007/12/4
From:
Posts: 4075
 Re: Locking the main branches in order to use merge reque...
merge completed and you have been giving commit access to the branch, too.