On 12/13/13 13:36 , Robert Ellenberg wrote: > 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).
Your feature belongs on master, but please don't merge it until after we've made the 2.6 release branch. > Also, I've grown to like "feature branches" as a way to isolate individual > features: > http://nvie.com/posts/a-successful-git-branching-model/ > > While this work flow involves more branching and merging than a simple > linear workflow, it makes it easier to keep track of why a given commit was > added. By dividing work up into "features", it keeps individual branches > short, and makes merging and rebasing much easier. Given how many branches > diverge from master for months at a time (mine included), this might help > keep things manageable. Yes! +100! We use a slightly different workflow, but the core idea is the same: small focused short-lived feature branches. Some of us (me!) like rebase a lot, some of us don't. I think the use of rebase is optional, what really matters is good clear commits in the final push. I personally have a hard time getting my commits right the first time around, so i rely on rebase to clean up my private history before pushing. The workflow we use is based on the "Merging upwards" flow here: https://www.kernel.org/pub/software/scm/git/docs/gitworkflows.html Many of the things on that page are valuable techniques for making the shared project manageable. -- 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
