Sebastian Kuzminsky wrote: > 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). > > Thanks! Yes, I know this, but I do it wrong every time!
Jon ------------------------------------------------------------------------------ Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS, MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft MVPs and experts. ON SALE this month only -- learn more at: http://p.sf.net/sfu/learnmore_123012 _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
