On Fri, Dec 13, 2013 at 03:36:29PM -0500, Robert Ellenberg wrote: > Hi All, > > I'm preparing a beta version of the circular arc blend branch on my mirror, > so I'm curious where would be the best place to rebase onto (latest master > vs. a 2.5 branch).
Since the planner in v2.5_branch and master are almost identical, IF you want to be able to also test your planner on v2.5, making a branch off the current v2.5_branch (which is the same as git merge-base v2.5_branch master, since we use the "merging upwards" workflow) would allow you to merge it either place easily. The changes won't actually go into a 2.5 release of course, but it might be nice to be able to try it there. If you'll send me the public half of a ssh keypair I'll get push access to git.linuxcnc.org set up for you. ------------------------------------------------------------------------------ Rapidly troubleshoot problems before they affect your business. Most IT organizations don't have a clear picture of how application performance affects their revenue. With AppDynamics, you get 100% visibility into your Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro! http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
