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. > Well, I tried this, but with git set for the v2.5_branch, it couldn't fine the SHA1 links to the commits I made to master. Some of them were already in 2.5, so I must have done those the right way. One of the other fixes had those nasty "<<<<<' and ">>>>>" markers, and would not have compiled. I hand-edited it and re-pushed the change, and it now looks right in the v2.5_branch, I hope I did all this right and it won't cause a conflict with what is in master. Groan, this git system is WAY more complicated than I am used to.
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. SALE $99.99 this month only -- learn more at: http://p.sf.net/sfu/learnmore_122412 _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers