I like #1 or #2. #3 is limiting. On Mon, Feb 13, 2012 at 05:49, Gerhard Petracek <gerhard.petra...@gmail.com>wrote:
> hi @ all, > > since a new commit was pushed before we merged back the release branch, we > have to discuss release branches right now. > > the options i see right now are: > 1) we push the external named release-branch as it is (+ tag) and rebase > the master > 2) we merge the external release branch locally and just push the result > as i did with the master at [1] > 3) we don't allow pushes (in the future) before we pushed the fast > forwarded master. > > regards, > gerhard > > [1] https://github.com/os890/DS_Discuss > -- Jason Porter http://lightguard-jp.blogspot.com http://twitter.com/lightguardjp Software Engineer Open Source Advocate Author of Seam Catch - Next Generation Java Exception Handling PGP key id: 926CCFF5 PGP key available at: keyserver.net, pgp.mit.edu