On 1/18/13 10:55 , Jon Elson wrote: > Chris Morley wrote: >> I would like to request that we release the next 2.5 bug fix >> as soon as practical. >> As well as many updates added to the branch, there is an >> import bug fix in PNCconf that effects ALL servo configs >> made by it. >> > OK, I have committed a fix in master for dealing with odd values when > scanning the EPP > bus. If somebody would give me the git syntax to merge that fix into > the 2.5 branch, > I'd like to get that included in the next bugfix release. >
You'll want to use 'git log master' to find the SHA1 of the commit, then check out 2.5 and use 'git cherry-pick -x SHA1' to copy that commit into the 2.5 branch. But this is really a work-around, the preferred way to make bug fixes is to originally commit them on the oldest applicable branch (v2.5_branch in this case), then merge that branch into the newer branch (master). -- Sebastian Kuzminsky ------------------------------------------------------------------------------ Master HTML5, CSS3, ASP.NET, MVC, AJAX, Knockout.js, Web API and much more. Get web development skills now with LearnDevNow - 350+ hours of step-by-step video tutorials by Microsoft MVPs and experts. SALE $99.99 this month only -- learn more at: http://p.sf.net/sfu/learnmore_122812 _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
