On Sat, Aug 11, 2012 at 11:51:41AM -0400, Matt Shaver wrote: > On Sat, 11 Aug 2012 15:38:23 +0000 > Chris Morley <[email protected]> wrote: > > > What happens is the old branch is merged up in to the newer branches. > > This way all the branches get the bug fix. > > OK, this makes a lot of sense. Of course, I had it totally backwards :)
We use the "Merging Upwards" system as described in the gitworkflows man page. Chris M has it right -- changes that fix bugs that are in release branches should go directly in the oldest affected release branch. Then the release branches are merged upwards: v2.4_branch into v2.5_branch, v2.5_branch into master. At this time there may not ever be another 2.4 release, but it is not out of the question that a bug fix would go there. People sure may be using this very stable branch. Before making changes in 2.5 it's true it's best to chat with me unless you are sure it's safe -- use your best judgement. ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
