reverting-commits-by-rolling-forward

Reverting changes to develop or master (Rolling Forward).
To revert a merge to develop (e.g. a pull request), generate a commit that is the reverse of the pull request merge

git revert -m 1 <sha>

See example PR ...

Adding back reverted changes to develop or master
To add back reverted changes, cut a new branch and generate a patch from the original commit/merge

git format-patch -1 <sha>

Apply this patch and commit as a new commit.