markdown source builds

Auto-generated via `{sandpaper}`
Source  : 5e9ee84
Branch  : main
Author  : Dimitrios Theodorakis <[email protected]>
Time    : 2025-03-03 11:24:39 +0000
Message : MetOffice#76 Remove third, duplicate footnote on the repo access episode

Author: actions-user

00-repo-access.md

@@ -71,7 +71,7 @@ Repositories in organisations have more levels of permissions[^permission-org].
 Team members require at least **write** access to use the branching model.
 For all lower levels of access use the forking model.
 
-[^permission-org]: The [GitHub Documentation](https://docs.github.com/en/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/repository-roles-for-an-organization) has more information on the 
+[^permission-org]: The [GitHub documentation](https://docs.github.com/en/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/repository-roles-for-an-organization) has more information on the
 different permission levels for repositories in organisations.
 
 #### Checking Access for Organisational Repositories
@@ -113,7 +113,8 @@ If you have write access (or higher), GitHub's online editor will appear.
 If you have Maintain or Admin privileges you can edit the repositories settings.
 Navigate to the top right **Settings** tab from the repository homepage.
 
-See the GitHub documentation[^permission-org] for the differences between Maintainers and Admins.
+See the [GitHub documentation](https://docs.github.com/en/organizations/managing-user-access-to-your-organizations-repositories/managing-repository-roles/repository-roles-for-an-organization)
+for the differences between Maintainers and Admins.
 
 :::
 

04-review.md

@@ -164,6 +164,21 @@ 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.
+
+::::::::::::::::::::::::::::::::::::: instructor
+
+Important!
+
+> Click any of the 3 merge options
+
+The two instructors can select
+squash and merge, and rebase and merge.
+Some learners will have skipped ahead and already clicked
+on a normal merge.
+This guarantees the repository history shows all three merge types.
+
+::::::::::::::::::::::::::::::::::::::::::::::::
+
 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:
@@ -207,6 +222,16 @@ Head over to the repositories **Issues** tab.
 Check that your Issue for adding your favourite cloud file
 was closed when you merged the PR.
 
+::::::::::::::::::::::::::::::::::::: instructor
+
+There may not be time for learners to complete the challenge
+(updating their local main branch and deleting their local feature branch).
+You should update your local main branch and use `git log --oneline --graph`
+to demonstrate the messy history that has been created due to
+each learner selecting a random merge strategy in their PRs.
+
+::::::::::::::::::::::::::::::::::::::::::::::::
+
 :::::::::::::::::::::::::::::::::::::::  challenge
 
 ## Local Cleanup

md5sum.txt

@@ -3,11 +3,11 @@
 "LICENSE.md" "b24ebbb41b14ca25cf6b8216dda83e5f" "site/built/LICENSE.md" "2024-11-19"
 "config.yaml" "a0157ab76adc733800b01dccf01125b6" "site/built/config.yaml" "2025-02-26"
 "index.md" "4f0b01239324c43e254def95f89923a9" "site/built/index.md" "2025-01-20"
-"episodes/00-repo-access.md" "e6524e4a06479f449a44fda3b440f690" "site/built/00-repo-access.md" "2025-02-25"
+"episodes/00-repo-access.md" "2467b2af26577b9c11ac300706e8558c" "site/built/00-repo-access.md" "2025-03-03"
 "episodes/01-issues.md" "f22fad38ef9a49a94df0d58619afdf2c" "site/built/01-issues.md" "2025-02-26"
 "episodes/02-branching.md" "4c1ea5d3b2a27714d1063d0c552ee7e9" "site/built/02-branching.md" "2025-02-27"
 "episodes/03-feature-branch.md" "02088db1460b479504a503c8f5bff768" "site/built/03-feature-branch.md" "2025-02-26"
-"episodes/04-review.md" "a05866f6f104273960133396026217c5" "site/built/04-review.md" "2025-02-26"
+"episodes/04-review.md" "db6c731c1e6ff113cea69eda75a4c00f" "site/built/04-review.md" "2025-03-03"
 "episodes/Break.md" "3f756cfaee9cc1c397381668102aaea0" "site/built/Break.md" "2025-01-10"
 "episodes/07-history.md" "ef281c80f9126ca785bfa170e8c27a62" "site/built/07-history.md" "2025-02-27"
 "episodes/05-forks.md" "b8ec1e10b8ce0513086cc32693865559" "site/built/05-forks.md" "2025-02-26"