error: commit is a merge but no -m option was given. code example
Example: how to revert a git revert
git revert <commitHashOfTheRevert> # locate the hash the revert was done
#this will invert the changes made in that commit
#and preserve the git history