From 82c506192b5ae1a454dccfae2f41fa3ee6d5e990 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sun, 3 May 2020 10:21:21 -0700 Subject: [PATCH] ; 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 63e96d0397c..d109cdaa354 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 ==================================== -- 2.39.5