On 03/30/2014 05:09 PM, andy pugh wrote: > On 10 January 2014 16:37, Sebastian Kuzminsky <s...@highlab.com> wrote: > >> 1. New features should be developed in feature branches, tested and >> stabilized and reviewed there. > > Can you point to a feature branch that has ever been merged?
I'm sorry i haven't given you feedback on your sql-tooltable branch... As for the question you actually asked, I can only point to smallish feature branches that were heavily promoted by the developers. The most recent example is the ilowpass fix branch that Jeff just merged. Before that there was the m61-in-2.5 branch, the toolno/pocketno unhorking branch, the xhc-hb04 branch, the vfd-b branch, etc. Not all of them show up as merges in Jeff's git log command, because sometimes the integration was a fast-forward merge (ie, the feature branch was rebased onto the tip of the destination branch just before being merged, so no actual merge commit was created). I'm not sure if any of these count as the kind of feature branch you're referring to above. -- Sebastian Kuzminsky ------------------------------------------------------------------------------ _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
