On Fri, 2008-07-04 at 12:14 +0100, Marnie McCormack wrote: > All, > > I'd like to echo the congratulations of the two Roberts ! > > Likewise am happy for a branch or a tag to be created. Note that we're > investing time in fixing up trunk (client working with broker and suchlike > :-) so we can work together there going forward. Thus a minor plea for any > fixes applied to branches etc to be merged down there as appropriate. I am > definitely not on the moral high ground here ......
+1 to that plea. Fixes should always be merged from branch to trunk unless the relevant code in trunk has changed too much for the fix to be relevant. (If we ever get to multi-level branching we should merge from child branch to parent branch recursively up to trunk. Pray we never get there ;)
