markdown source builds

Auto-generated via `{sandpaper}`
Source  : 64cb250
Branch  : main
Author  : Dimitrios Theodorakis <[email protected]>
Time    : 2024-12-02 18:05:53 +0000
Message : MetOffice#18 Add in instructions for updating a local branch that was rebased on the remote.

Author: actions-user

08-rebase.md

@@ -512,6 +512,45 @@ if there are commits on the remote branch
 you would override by pushing if you forgot
 to check yourself.
 
+## Pulling a Rebased Branch
+
+If you have rebased a feature branch
+and then overwritten the remote branch
+on GitHub your collaborators may need to pull
+these changes to their local copies.
+
+If the collaborator already had a copy
+of your branch from before the rebase;
+attempting a normal pull will result in a
+lot of conflicts due to the incompatible
+histories of the original and the rebased
+branches.
+
+The collaborator should
+first switch to the local branch they want to
+overwrite with the rebased remote version:
+
+```bash
+$ git switch add_plot_script
+```
+
+Now fetch but don't attempt to merge the
+remote branch:
+
+```bash
+$ git fetch origin add_plot_script
+```
+
+Reset the local branch to match the remote origin:
+
+```bash
+$ git reset --hard origin/add_plot_script
+```
+
+Now their local branch matches the rebased
+feature branch from GitHub and
+everyone's branches are in sync.
+
 :::::::::::::::::::::::::::::::::::::::  challenge
 
 ## Modifying Commit Messages

md5sum.txt

@@ -12,7 +12,7 @@
 "episodes/06-conflict.md" "2d24ee01ff240b5b128a8574a18ab12f" "site/built/06-conflict.md" "2024-11-19"
 "episodes/07-history.md" "ef0866f16853f3c708c2bfea2d3ef4b4" "site/built/07-history.md" "2024-12-02"
 "episodes/End.md" "c34fe594102fe3c81f4bad2c5c7bbbfc" "site/built/End.md" "2024-12-02"
-"episodes/08-rebase.md" "b0aa291d41fe59e4604ace8f354ace21" "site/built/08-rebase.md" "2024-12-02"
+"episodes/08-rebase.md" "d3caf47ed218f5655c948f06551f3a55" "site/built/08-rebase.md" "2024-12-02"
 "episodes/09-pre-commit.md" "99096b6d10f4f7c1f6f5bfa72f728e45" "site/built/09-pre-commit.md" "2024-12-02"
 "instructors/instructor-notes.md" "a5d4cdfe96cb07fe8460111021491b58" "site/built/instructor-notes.md" "2024-11-19"
 "learners/discuss.md" "aaef6991af918125ae722d3ce4e36443" "site/built/discuss.md" "2024-11-19"