Branch Management

Which Branch Do I Push To?

Royale uses the popular Git Branching Strategy as outlined in this article

It is up to the committers to know when there is an active release branch and be more careful about committing. That's because some articles advise against using cherry-picking and plus, the Release Manager (RM) has enough work to do, so it is up to the rest of us to try to save him or her time.

So, keep an eye on the dev@royale list and when you see emails with "Release Step 001" in the subject, that means that someone is cutting a release branch and it is time to stop automatically checking everything into the develop branch. Once a release branch is cut, anything you want to have in the next release should be committed to the release branch. If you then need it in the nightly build, then merge the release branch back into develop.

One thing we can try is that if you have doubt about which branch to push to, then put your changes in its own branch and push that branch to the remote origin. Then the RM can decide whether to merge to the release branch or not without having to cherry-pick.