<div dir="ltr"><div><div>The master branch is for active development. The 3.5 branch was created when we decided that we wanted to do a 3.5 release and forked from that point on. All the supplemental checkins in 3.5 are cherry-picked manually out of the ones in master. <br>
<br></div>This allows us introduce experimental feature in the main line, while keeping stable trees in parallel for quick dot-releases. Since we do backwards releases on multiple versions, this works better for us.<br><br>
</div>Luc<br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, May 1, 2013 at 6:01 PM, Julian Hyde <span dir="ltr"><<a href="mailto:jhyde@pentaho.com" target="_blank">jhyde@pentaho.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I know that the master and lagunitas branches diverged a long time ago (they were different branches in perforce, and we were never able to stitch them together properly when we migrated from perforce to git).<br>
<br>
I don't know much about the release branch. I doubt that it has diverged in the same way that lagunitas has.<br>
<br>
Luc moved the tags into RELEASE.txt, so he is probably the best person to answer this.<br>
<br>
Julian<br>
<br>
_______________________________________________<br>
Mondrian mailing list<br>
<a href="mailto:Mondrian@pentaho.org">Mondrian@pentaho.org</a><br>
<a href="http://lists.pentaho.org/mailman/listinfo/mondrian" target="_blank">http://lists.pentaho.org/mailman/listinfo/mondrian</a><br>
</blockquote></div><br></div>