This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git
The following commit(s) were added to refs/heads/master by this push:
new 6bfca0b Updated Branch Management (markdown)
6bfca0b is described below
commit 6bfca0b806bdb4664e0b585878d261cf6b1aa300
Author: aharui <[email protected]>
AuthorDate: Fri Oct 4 17:06:00 2019 -0700
Updated Branch Management (markdown)
---
Branch-Management.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Branch-Management.md b/Branch-Management.md
index 9e85360..85da746 100644
--- a/Branch-Management.md
+++ b/Branch-Management.md
@@ -4,4 +4,6 @@ Royale uses the popular Git Branching Strategy as outlined in
this [article](htt
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](http://www.draconianoverlord.com/2013/09/07/no-cherry-picking.html)
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.
\ No newline at end of file
+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.
\ No newline at end of file
