Revertir la fusión
git fetch upstream
git checkout upstream/master -b revert/john/foo_and_bar
Dead Deer
git fetch upstream
git checkout upstream/master -b revert/john/foo_and_bar