>
> > 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.
>
as far as bug fixes go, as long as they won't break anything they go in the
oldest branch that is appropriate.
What happens is the old branch is merged up in to the newer branches.
This way all the branches get the bug fix.
If it's a bug fix that will break something you should talk to the release
manager ( Chris R at the moment ) - it would have to be pretty serious for
him to agree to that.
new stuff (that may or may not break things) goes in to master which eventually
will become a base for the next major release (2.6 in this case)
Now when you committed to 2.5 by mistake, I'm pretty sure you should _not_ have
recommitted to master - I _think_ this will cause a merge error.
I'll let someone more knowledgeable then me advise you on the proper fix.
Do you trial push with git push --dry-run ?
This gives a chance to confirm the branch your pushing to.
Chris M
------------------------------------------------------------------------------
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
