-- this is done by doing a merge commit with "ours" strategy which obsoletes the branch. these are the steps I did: git branch -m master master-old-20170124 git branch master release-3.0.x git checkout master git merge -s ours master-old-20170124revert-dabc3590
commit
372f33bf50