On 12/10/13 10:46 , Michael Haberler wrote: > I note that two master commits recently appeared by Jeff and Dewey, providing > and using a new feature of the linuxcnc module, namely carrying the EMC2_HOME > pathname > > that's certainly useful for Python code using this module, but unfortunately > not applicable beyond > > also, ubc3 already has a more general mechanism for some time, the > linuxcncconfig.py module which is autogenerated by configure but not tied to > the use of the linuxcnc module:
This is not the first time that useful commits have been duplicated in your branches and mainline: the other example that comes to mind is the hostmot2 memcpy thing. > please suggest a way how to get rid of this feature overlap downstream I'm instead going to suggest a better way to collaborate, to minimize problems like this in the future. What i'm about to suggest is what I do, and it works well for me. It often happens that while i'm working on a change, i come across a problem in the code that impacts or interacts with what i'm doing -- a bug or a missing feature that i want to build on, for example. When that happens i take care of that tangential problem, then rebase those commits to the beginning of my branch and push them as soon as the problem is fixed. The goal is to get each small incremental improvement out of my branch and into mainline as quick as possible. An additional benefit is that it's easier for reviewers to digest the changes in smaller, self-contained chunks. This work flow is a big part of why i'm such a big proponent of rebase over merge. I think this is fairly standard practice in collaborative environments, and it works well, though at the cost of a bit more work on the original author's part. -- Sebastian Kuzminsky ------------------------------------------------------------------------------ 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
