<html><body>
<p><font size="2" face="sans-serif">Hi Infra team,</font><br>
<br>
<font size="2" face="sans-serif">This thread is about branching model, since my team just put a project on stackforge and ready to create a milestone-proposed branch for final release to support openstack icehouse release. Now it's time for us to consider branching stategy(parallel development) on github, guess there are 2 options:</font><br>
<br>
<font size="2" face="sans-serif">a popular NVIE model, <a href="http://nvie.com/posts/a-successful-git-branching-model/">http://nvie.com/posts/a-successful-git-branching-model/</a></font><br>
<font size="2" face="sans-serif">OpenStack branching model, <a href="https://wiki.openstack.org/wiki/Branch_Model">https://wiki.openstack.org/wiki/Branch_Model</a></font><br>
<br>
<font size="2" face="sans-serif">Openstack also repects the NVIE one:</font><br>
<font size="2" face="serif"><i>"Starting with the Diablo cycle, OpenStack core projects use a branching model close to the </i></font><a href="http://nvie.com/posts/a-successful-git-branching-model/"><font size="2" color="#0000FF" face="serif"><i><u>NVIE model</u></i></font></a><font size="2" face="serif"><i> that ensures an almost-always-open </i></font><font size="2" face="serif"><i>master</i></font><font size="2" face="serif"><i> while still allowing to freeze features and select bugfixes in a release branch (</i></font><font size="2" face="serif"><i>milestone-proposed</i></font><font size="2" face="serif"><i>)"</i></font><br>
<br>
<font size="2" face="sans-serif">After review the 2 models, I have several questions:</font><br>
<font size="2" face="sans-serif">1. OpenStack's master branch works as both the development and master(production ready) branch of the NVIE model together, right? I wonder 2 main branches vs 1 main branch, which one is better and why?</font><br>
<font size="2" face="sans-serif">2. I noticed that there are stable/icheouse, stable/havana branches on github web GUI of many openstack projects like nova, heat, ironic. To what branches mentioned in the above 2 models can these stable/* mapped, supporting release branches? hot fix branches? BTW, if I git clone these projects, I cannot see those stable/* branches with git branch.. why? And when were they created in a OpenStack release cycle and what for?</font><br>
<br>
<font size="2" face="sans-serif">Any opinion is apprecicated, thanks in advance!</font><br>
</body></html>