Chapter 9

Resolving conflicts trying to revert.
Did a "git push" from command line.