markdown source builds

Auto-generated via `{sandpaper}` Source : 78cc223 Branch : main Author : Dimitrios Theodorakis <[email protected]> Time : 2024-12-02 18:12:34 +0000 Message : MetOffice#19 Adds instructions for restoring a feature branch from a backup when rebasing goes wrong.
astroDimitrios · Dec 2, 2024 · daa3692 · daa3692
1 parent 587c7cc
commit daa3692
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/08-rebase.md b/08-rebase.md
@@ -162,6 +162,26 @@ goes wrong during the rebase:
 $ git branch add_plot_script.backup
 ```
 
+If at anytime you want to restore the branch
+from your backup switch to the backup:
+
+```bash
+$ git switch add_plot_script.backup
+```
+
+Delete the branch where rebasing was attempted:
+
+```bash
+$ git branch -D add_plot_script
+```
+
+Re-create the original branch while still
+on the backup branch:
+
+```bash
+$ git switch -c add_plot_script
+```
+
 :::
 
 We will rebase interactively using the `-i` flag.

diff --git a/md5sum.txt b/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" "d3caf47ed218f5655c948f06551f3a55" "site/built/08-rebase.md" "2024-12-02"
+"episodes/08-rebase.md" "0c9d3b4af5f9563768edd6c4d0cb871c" "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"