offer the revert command, just in case
do not commit after merge