There is a guide somewhere, I don't remember where actually. Making story short: - Master branch is the stable branch, cloning the master branch will usually result in having the current stable release. - Development branch is where development for the next release happens - next branch is a temporary branch used only to prepare the upcoming release
workshop branch was actually a feature branch where pylons-less experiment was made and that was meant to be merged back into development. Due to 2.2 release taking more time than expected it actually lived longer than it had to. It is going to disappear as soon as the 2.2.1 is released, at that time workshop branch will be merged into the development branch and will disappear. On Wed, Jan 23, 2013 at 10:07 PM, Moritz Schlarb <[email protected]>wrote: > Dear Developers, > > there is one thing that is bothering me since I started to follow the > TurboGears development: > > I really don't understand your use of Git branches. (:D) > Atm, there are three actively used branches: development, workshop and > next. > > I am very sure that you probably have some convention on which one to > use for what purpose, but I just don't quite get it... > > It would be cool if you could document that somehow - maybe in a file > according to this GitHub features: > https://github.com/blog/1184-contributing-guidelines - so that > interested people have a better chance of understanding it. ;) > > Regards, > Moritz > > PS: Just a side note: For my project, I am successfully employing the > Git branching model as described here: > http://nvie.com/posts/a-successful-git-branching-model/ which also > features a Git extension module to simplify its use: > https://github.com/nvie/gitflow. I know that threebean does the same for > tw2 projects. > > -- > Moritz Schlarb > > -- > You received this message because you are subscribed to the Google Groups > "TurboGears Trunk" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected]. > For more options, visit this group at > http://groups.google.com/group/turbogears-trunk?hl=en. > > -- You received this message because you are subscribed to the Google Groups "TurboGears Trunk" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/turbogears-trunk?hl=en.
