On 02/09/2012 04:10 PM, Julien Nitard wrote:
- The master branch corresponds to the current release branch, again with an important difference. In the current situation, trunk is merged directly into release, with the (manual) exception of libraries that are in too turbulent state, and after that the release branch is updated until everything is really ready for release. In the new situation, a new (temporary) release branch is forked from develop first (which automatically excludes turbulent changes because those reside in separate feature branches) and then updated until all tests pass (ideally), at which point it is finally merged into master (as well as back into develop). So the master branch only includes the actual releases, which of course are also tagged.
This doesn't fit in my small brain when I try to imagine it. Sorry :( I guess it's time people on both sides fire their slide editors so that I (and hopefully others) can have a better view of the problem and the solutions
This has pictures: http://nvie.com/posts/a-successful-git-branching-model/ Mika Heiskanen