On Sat, 11 Aug 2012 05:00:23 +0000 Chris Morley <[email protected]> wrote:
> actually this should have gone in 2.5 (even 2.4 ? not sure about that) > the pin is wrong there too - but it is an pin that follows machine on. I do this wrong all the time, but what's been explained to me is: 1. If I have a change, I'm to put it in 'master'. 2. Someone who knows what they are doing will come along and merge my changes (if applicable, and non-controversial, and non-backwards-compatibility-breaking) into the release branches as appropriate. I goofed this up just today by committing directly to 'v2.5_branch' some changes to config files I maintain, then realizing my mistake, checked out 'master' and re-committed them there as well. Is this right? Thanks, Matt ------------------------------------------------------------------------------ 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
