Demo of needing to re-revert in order to "undo" a previous revert of a merge commit

revert-demo.sh

export GIT_EDITOR=true
mkdir revert-test
cd revert-test
git init

echo "hello world" > README.md
git add README.md
git commit -m "initial commit"

git checkout -b feature/now_with_caps
echo "HELLO WORLD" > README.md
git add README.md
git commit -m "capitalize hello statement"

git checkout master
git merge feature/now_with_caps --no-ff

git checkout -b maint/remove_caps
git revert -m1 HEAD

git checkout master
git merge maint/remove_caps --no-ff

git checkout feature/now_with_caps
git rebase master

git checkout master
git merge feature/now_with_caps --no-ff