I would create a new branch (to make the release): starting from the current "locked" branch bug with a revert of the problematic bug-fix And I would leave the "bug" branch as it is. No cherry picking.
– Chad Johnson May 18 '10 at 19:11 1 @Chad: you can release directly from that new branch. The trick with release management is: "The branch from which the release has been produced... is not that important. The tag is.
" If the release has issues, you need to be able to reference the right sources from the right tag. The fact that this tag has been set on branch b1 or b2 or b-blah is not that relevant. – VonC May 18 '10 at 19:21 Hmm, very good to know.
Thanks Von. – Chad Johnson May 18 '10 at 19:30.
So, now I have super critical bug fixes that have to be released, but the 'bugs' branch is locked up, and I can't merge into the 'default' branch and release because the half-fixed bug will also be released, and I can't let that happen. So what do I do? Should I revert the change in the bugs branch, merge bugs into default, and release?
I cant really gove you an answer,but what I can give you is a way to a solution, that is you have to find the anglde that you relate to or peaks your interest. A good paper is one that people get drawn into because it reaches them ln some way.As for me WW11 to me, I think of the holocaust and the effect it had on the survivors, their families and those who stood by and did nothing until it was too late.