martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

; admin/notes/git-workflow

Browse Source 
Mention reverting on release branch.
This commit is contained in:
Glenn Morris
2020-05-03 10:21:21 -07:00
parent 97146efdc6
commit 82c506192b
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
admin/notes/git-workflow
View File

@@ -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
====================================