On Sun, Jul 10, 2011 at 12:54:28PM -0500, Jon Elson wrote: > I made some major additions to the docs/src/drivers/pico_ppmc.txt > some time ago, and just wanted to make sure they were getting included > in the 2.5 docs. I didn't see it in the merge, but maybe that was because > I committed it to the development head.
Master doesn't ever get merged into v2.5_branch. This would put all experimental code and new features into the stable release branch. That's sure not what we want. We only merge forward (like v2.5_branch into master). I see your big change d8bb615f3 was already cherry-picked from master back onto v2.5_branch. There is another small change 0b9bc4874 that I have now cherry-picked for you as well. We use the "Merging upwards" workflow (you can read about it in man gitworkflows). If you have any questions please ask here or on irc. The executive summary is that if you want your changes in the current releases, you should be making them in the stable release branch. ------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2 _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
