Skip to content

Commit 17bc5a0

Browse files
committed
markdown source builds
Auto-generated via `{sandpaper}` Source : 3c18dd5 Branch : main Author : Dimitrios Theodorakis <[email protected]> Time : 2024-12-02 17:47:33 +0000 Message : Move the rebase episode to be optional after the End card. Remove the opinionated line about rebasing after merging. Clarify that episodes after the end card are optional so that they don't have to have optional in the title of the episode. (MetOffice#17)
1 parent 9d14ace commit 17bc5a0

File tree

6 files changed

+16
-12
lines changed

6 files changed

+16
-12
lines changed

07-history.md

-3
Original file line numberDiff line numberDiff line change
@@ -268,9 +268,6 @@ a commit that introduced a bug.
268268

269269
Your team will decide what approach is right
270270
for your project.
271-
If you choose to perform normal merge's on
272-
your PRs we recommend rebasing your feature branch
273-
before the PR is ready for review.
274271

275272
:::::::::::::::::::::::::::::::::::::::: keypoints
276273

08-rebase.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Rebasing
2+
title: 'Rebasing'
33
teaching: 15
44
exercises: 10
55
---

09-pre-commit.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: 'Optional: Pre-commit'
2+
title: 'Pre-commit'
33
teaching: 10
44
exercises: 10
55
---

End.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ Please remember to fill out your post-workshop feedback.
99
This feedback is vital for us to keep improving the lesson
1010
for other learners.
1111

12+
Episodes after this **End** page are optional.
13+
Your instructor may choose to teach these episodes
14+
if time permits.
15+
Otherwise feel free to work through the episodes
16+
in your own time.
17+
1218
### Where to next?
1319

1420
We've covered a lot over the last two workshops
@@ -19,5 +25,6 @@ when it comes to GitHub!
1925
GitHub training.
2026
- In this lesson you saw automated testing
2127
of PRs using [GitHub Actions](https://learn.microsoft.com/en-us/training/modules/introduction-to-github-actions/) which you might like to explore more.
22-
- These tests ran [pre-commit](https://pre-commit.com/) checks which you can set up locally to run before you commit.
28+
- The optional [rebasing episode](./08-rebase.md) guides you through rebasing a branch.
29+
- These PR tests ran [pre-commit](https://pre-commit.com/) checks which you can set up locally to run before you commit.
2330
The optional [pre-commit episode](./09-pre-commit.md) outlines how to set up some basic checks.

config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ episodes:
6767
- 05-forks.md
6868
- 06-conflict.md
6969
- 07-history.md
70-
- 08-rebase.md
7170
- End.md
71+
- 08-rebase.md
7272
- 09-pre-commit.md
7373

7474
# Information for Learners

md5sum.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"file" "checksum" "built" "date"
22
"CODE_OF_CONDUCT.md" "c93c83c630db2fe2462240bf72552548" "site/built/CODE_OF_CONDUCT.md" "2024-11-19"
33
"LICENSE.md" "b24ebbb41b14ca25cf6b8216dda83e5f" "site/built/LICENSE.md" "2024-11-19"
4-
"config.yaml" "cd07f9e232101c69556f8c43b4d2954d" "site/built/config.yaml" "2024-11-19"
4+
"config.yaml" "d5885caa6a401259de6848faf8e05b31" "site/built/config.yaml" "2024-12-02"
55
"index.md" "45612f1d27e63cd56142e054a40ab388" "site/built/index.md" "2024-11-19"
66
"episodes/01-issues.md" "000d7146e52f7793979444376445b387" "site/built/01-issues.md" "2024-11-19"
77
"episodes/02-branching.md" "ac44127a3dc4c5d71db505c7870488c3" "site/built/02-branching.md" "2024-11-19"
@@ -10,10 +10,10 @@
1010
"episodes/Break.md" "360a416d9defbe83d36a1f08fbcfa50f" "site/built/Break.md" "2024-11-19"
1111
"episodes/05-forks.md" "c8a0586d08b229b954fd5dce7f0b5b70" "site/built/05-forks.md" "2024-11-19"
1212
"episodes/06-conflict.md" "2d24ee01ff240b5b128a8574a18ab12f" "site/built/06-conflict.md" "2024-11-19"
13-
"episodes/07-history.md" "59cf89199345e7ebc9ef5b9885aba208" "site/built/07-history.md" "2024-11-19"
14-
"episodes/08-rebase.md" "ed16151d04a80307d24bfae885cda5ab" "site/built/08-rebase.md" "2024-11-19"
15-
"episodes/End.md" "94965d26bd9a480883cb7816c0113f51" "site/built/End.md" "2024-11-19"
16-
"episodes/09-pre-commit.md" "3cd74bde18db6eb15aebf0bfae497dc0" "site/built/09-pre-commit.md" "2024-11-19"
13+
"episodes/07-history.md" "ef0866f16853f3c708c2bfea2d3ef4b4" "site/built/07-history.md" "2024-12-02"
14+
"episodes/End.md" "c34fe594102fe3c81f4bad2c5c7bbbfc" "site/built/End.md" "2024-12-02"
15+
"episodes/08-rebase.md" "b0aa291d41fe59e4604ace8f354ace21" "site/built/08-rebase.md" "2024-12-02"
16+
"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"
1919
"learners/fcm-git_cheat_sheet.md" "a90c25c1218a18430dd67a243e63533e" "site/built/fcm-git_cheat_sheet.md" "2024-11-19"

0 commit comments

Comments
 (0)