Maintaining stable and master branches ...
Hey y'all,
Quick question. We've recently moved StackTach to StackForge and were wondering about maintaining the Stable branch. Is it ok to squash merge the changes from master into stable or is it best to cherry-pick each change and re-submit each review?
I'm assuming the latter for things so you can easily revert ... but I guess the review can just be a rubber-stamp to keep the review process light?
Thanks! -S
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512
Unless there is a very good reason to squash or modify backported patches, you must cherry-pick them individually [1].
[1]: https://wiki.openstack.org/wiki/StableBranch#Proposing_Fixes
On 21/05/14 14:52, Sandy Walsh wrote:
Hey y'all,
Quick question. We've recently moved StackTach to StackForge and were wondering about maintaining the Stable branch. Is it ok to squash merge the changes from master into stable or is it best to cherry-pick each change and re-submit each review?
I'm assuming the latter for things so you can easily revert ... but I guess the review can just be a rubber-stamp to keep the review process light?
Thanks! -S
Openstack-stable-maint mailing list Openstack-stable-maint@lists.openstack.org http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-stable-maint
participants (2)
-
Ihar Hrachyshka
-
Sandy Walsh