On Sun, Jul 31, 2011 at 11:48 PM, Stefan Behnel <stefan...@behnel.de> wrote: > mark florisson, 31.07.2011 22:08: >> >> I pushed it to release, should I rebase master on release now? > > Well, so far, the release branch hasn't been used and rc1 was created from > master. All current changes in master are either considered safe (by me :) > or just fixes that should go into the release.
I looked at them and I'd say they're both safe and worthy of going in. In general, if we have a distinct release branch (e.g if anything really interesting had gone in since the last rc), I'd say we should push release fixes to that and then merge into master. > So I think it's best to just > rebase your single commit in the current release branch back on the master, > delete the release branch and recreate it from the tip of the master branch. Yep, I'm seeing it. Thanks. - Robert _______________________________________________ cython-devel mailing list cython-devel@python.org http://mail.python.org/mailman/listinfo/cython-devel
