On 2011-04-24 12:43, Christian Ohm wrote:
0. New features are developed in feature branches. Bugfixes to a specific
feature go into the feature branch as well, even after it got merged.
(Generally, merges go only in one direction, no back-merges from master into
1. Merge feature branches deemed ready.
2. Test and get them really ready.
4. Goto 1.
I think thats the way to go.
What I do not quite understand:
(Generally, merges go only in one direction,
no back-merges from master into other branches.)"
that means we are not allowed to back merge branch unrelated bugfixes?
Warzone-dev mailing list