[Releasing] rethinking the branching scheme
Thiago Macieira
thiago.macieira at intel.com
Thu Feb 20 22:15:02 CET 2014
Em qui 20 fev 2014, às 12:17:14, Thiago Macieira escreveu:
> * D to D + 2 days: fast-forward stable to dev
To be clear here: "fast-forward stable to dev" means
git checkout stable
git merge --ff-only dev
A.k.a.:
git push gerrit dev:stable
Since dev was tested and passed CI, there's no need to retest. This operation
is as atomic as creating a new branch. In fact, it requires less effort because
there's no need to set up new CI rules or to retarget older stable fixes.
--
Thiago Macieira - thiago.macieira (AT) intel.com
Software Architect - Intel Open Source Technology Center
More information about the Releasing
mailing list