master 82c5061 2/2: ; admin/notes/git-workflow

[Glenn Morris]

branch: master
commit 82c506192b5ae1a454dccfae2f41fa3ee6d5e990
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    ; admin/notes/git-workflow
    
    Mention reverting on release branch.
---
 admin/notes/git-workflow | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow
index 63e96d0..d109cda 100644
--- a/admin/notes/git-workflow
+++ b/admin/notes/git-workflow
@@ -75,6 +75,17 @@ and add "Backport:" to the commit string.  Then
 git push
 
 
+Reverting on release branch
+===========================
+
+If a commit is made to the release branch, and then it is later
+decided that this change should only be on the master branch, the
+simplest way to handle this is to revert the commit on the release
+branch, and include in the associated log entry "do not merge to master".
+(Otherwise, the reversion may get merged to master, and inadvertently
+clobber the change on master if it has been manually made there.)
+
+
 Merging release branch to the master
 ====================================