How to revert one or more commits, dealing with any possible merge conflicts along the way.

git revert [--[no-]edit] [-n] [-m parent-number] [-s] [-S[<keyid>]] <commit>...
git revert --continue
git revert --quit
git revert --abort

==== Reverting