Use any merge strategy in the morning - link to the history section straight after lunch (MetOffice#71)

Author: astroDimitrios

episodes/04-review.md

@@ -163,7 +163,7 @@ you can approve the PR:
 Swap back to the Conversations tab.
 The PR is now ready to merge and has no conflicts with the
 base (`main` in this case) branch.
-Click **Squash and merge**; don't forget to move the PR
+Click any of the 3 merge options; don't forget to move the PR
 number to the start of the commit message like you did
 in the Version Control with Git lesson:
 
@@ -269,6 +269,18 @@ Deleted branch 1_favourite_cloud (was b7f26e6).
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::
 
+:::::::::::::::::::::::::::::::::::::::  challenge
+
+## How was your PR merged?
+
+In this episode you merged each others PRs.
+The reviewer used a random merge strategy to merge each PR.
+
+Explore the history of the repository with `git log` and find your PR merge.
+How has the chosen merge strategy affected the repositories history?
+
+::::::::::::::::::::::::::::::::::::::::::::::::::
+
 :::::::::::::::::::::::::::::::::::::::: keypoints
 
 - A Pull Request (PR) is where your code and science review takes place.

instructors/instructor-notes.md

@@ -207,6 +207,9 @@ watching the reviewer or the developer.
 Swap back to the first instructor so they can approve the changes.
 Make sure you cover the content in the
 **WHO PRESSES THE MERGE BUTTON?** callout.
+Learners can use any merge strategy here, you will use this as
+an opportunity to see the history in the next episode
+and suggest sticking to one.
 Give learners a break and the opportunity to complete
 the yellow challenge **Local Cleanup**.