> At this point we may want to investigate some of the workflows suggested
> in the gitworkflows[1] document. Specifically, here's how we can use
> topic branches, integration branches and merging upwards to put safe new
> features in 2.4.x after they're proven on master:
>
pncconf in 2.4 will need some features disabled.
In master I wish to continue to develop them, obviously.
How do I handle this with out messing up future merges
from trunk to 2.4 ?
Thanks
Chris M
_________________________________________________________________
Check your Hotmail from your phone.
http://go.microsoft.com/?linkid=9708121------------------------------------------------------------------------------
SOLARIS 10 is the OS for Data Centers - provides features such as DTrace,
Predictive Self Healing and Award Winning ZFS. Get Solaris 10 NOW
http://p.sf.net/sfu/solaris-dev2dev
_______________________________________________
Emc-developers mailing list
Emc-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/emc-developers
