Skip to content

Commit daa3692

Browse files
committed
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.
1 parent 587c7cc commit daa3692

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

08-rebase.md

+20
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,26 @@ goes wrong during the rebase:
162162
$ git branch add_plot_script.backup
163163
```
164164

165+
If at anytime you want to restore the branch
166+
from your backup switch to the backup:
167+
168+
```bash
169+
$ git switch add_plot_script.backup
170+
```
171+
172+
Delete the branch where rebasing was attempted:
173+
174+
```bash
175+
$ git branch -D add_plot_script
176+
```
177+
178+
Re-create the original branch while still
179+
on the backup branch:
180+
181+
```bash
182+
$ git switch -c add_plot_script
183+
```
184+
165185
:::
166186

167187
We will rebase interactively using the `-i` flag.

md5sum.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"episodes/06-conflict.md" "2d24ee01ff240b5b128a8574a18ab12f" "site/built/06-conflict.md" "2024-11-19"
1313
"episodes/07-history.md" "ef0866f16853f3c708c2bfea2d3ef4b4" "site/built/07-history.md" "2024-12-02"
1414
"episodes/End.md" "c34fe594102fe3c81f4bad2c5c7bbbfc" "site/built/End.md" "2024-12-02"
15-
"episodes/08-rebase.md" "d3caf47ed218f5655c948f06551f3a55" "site/built/08-rebase.md" "2024-12-02"
15+
"episodes/08-rebase.md" "0c9d3b4af5f9563768edd6c4d0cb871c" "site/built/08-rebase.md" "2024-12-02"
1616
"episodes/09-pre-commit.md" "99096b6d10f4f7c1f6f5bfa72f728e45" "site/built/09-pre-commit.md" "2024-12-02"
1717
"instructors/instructor-notes.md" "a5d4cdfe96cb07fe8460111021491b58" "site/built/instructor-notes.md" "2024-11-19"
1818
"learners/discuss.md" "aaef6991af918125ae722d3ce4e36443" "site/built/discuss.md" "2024-11-19"

0 commit comments

Comments
 (0)