I found this by far the most “Challenging” lesson so far.
I got myself into a bit of a pickle, when I was doing the reverse commit to take away my snowman’s arms I was getting a merge conflict, which was ironic as I skipped that challenge as I could not think of a scenario!
I tried to merge using Mine and Theirs and it would not go away and I was getting frustrated as to what I could of done to get myself here. So I thought oooo Stash ! So I stashed the files. Got myself back to the master and tried the reverse commit on my arms again… and hey presto it worked.
Very pleased with this small victory especially as it 22:45hrs 