[sup-devel] branching and merging

2011-02-10 Thread Hamish
Hello I'm wondering if there are preferred strategies for the feature branches. I'm aware that new branches should be branched off master, and merged into next when the author thinks they're ready. But I'm wondering when a merge has been done from a branch, should development continue on that br

Re: [sup-devel] branching and merging

2011-02-10 Thread William Morgan
Reformatted excerpts from Hamish's message of 2011-02-10: > But I'm wondering when a merge has been done from a branch, should > development continue on that branch? If it's essentially more work on the same feature, then yes, continue on that branch. Otherwise, no. Branches are cheap. The point