Skip to content

Commit f67900b

Browse files
committed
markdown source builds
Auto-generated via `{sandpaper}` Source : 865a9f0 Branch : main Author : Dimitrios Theodorakis <[email protected]> Time : 2025-02-27 16:32:53 +0000 Message : MetOffice#78 Removes code html tags from mermaid diagram accessibile descriptions
1 parent 17bcf01 commit f67900b

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

02-branching.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,19 +99,19 @@ config:
9999
---
100100
gitGraph
101101
accDescr {A git graph showing four branches including the default
102-
<code>main</code> branch.
102+
main branch.
103103
Each circle is a commit.
104104
A circle with an outline but no fill colour is a merge commit
105105
where one branch has been merged into another.
106-
The two feature branches and the <code>bug_fix</code> branch
107-
all branch off of <code>main</code> at the same commit.
108-
The <code>bug_fix</code> and <code>small_feature</code> branches
109-
are merged back into <code>main</code> after
106+
The two feature branches and the bug_fix branch
107+
all branch off of main at the same commit.
108+
The bug_fix and small_feature branches
109+
are merged back into main after
110110
being developed on their branches.
111-
The <code>large_feature</code> branch merges in the
112-
changes to <code>main</code> to fix any conflicts
111+
The large_feature branch merges in the
112+
changes to main to fix any conflicts
113113
before the feature is ready to be merged
114-
back into the <code>main</code> branch via a pull request.}
114+
back into the main branch via a pull request.}
115115
commit
116116
branch bug_fix
117117
checkout main

06-conflict.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ in the `main` branch into our feature branch
201201

202202
```mermaid
203203
gitGraph
204-
accDescr {A git graph showing the <code>main</code> branch being merged
205-
into the <code>7_add-citation-fitzroy</code> branch to resolve merge conflicts.}
204+
accDescr {A git graph showing the main branch being merged
205+
into the 7_add-citation-fitzroy branch to resolve merge conflicts.}
206206
commit id: 'cdb7fa6'
207207
branch 7_add-citation-fitzroy
208208
commit id: 'a3c5e13 Adds Robert Fitzroy as an author'

07-history.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ Starting with:
7676

7777
```mermaid
7878
gitGraph
79-
accDescr {A Git graph showing the <code>main</code> branch with a <code>feature</code> branch branching off at the second commit of <code>main</code>.}
79+
accDescr {A Git graph showing the main branch with a feature branch branching off at the second commit of main.}
8080
commit id: '4631ebc'
8181
commit id: 'ee406ac'
8282
branch feature
@@ -93,7 +93,7 @@ the two branches:
9393

9494
```mermaid
9595
gitGraph
96-
accDescr {A Git graph showing the result of merging a <code>feature</code> branch with the <code>main</code> branch. The history is non-linear in this case and difficult to read.}
96+
accDescr {A Git graph showing the result of merging a feature branch with the main branch. The history is non-linear in this case and difficult to read.}
9797
commit id: '4631ebc'
9898
commit id: 'ee406ac'
9999
branch feature
@@ -125,7 +125,7 @@ Starting with:
125125

126126
```mermaid
127127
gitGraph
128-
accDescr {A Git graph showing the <code>main</code> branch with a <code>feature</code> branch branching off at the second commit of <code>main</code>.}
128+
accDescr {A Git graph showing the main branch with a feature branch branching off at the second commit of main.}
129129
commit id: '4631ebc'
130130
commit id: 'ee406ac'
131131
branch feature
@@ -143,7 +143,7 @@ commit which is then merged onto main:
143143

144144
```mermaid
145145
gitGraph
146-
accDescr {A Git graph showing the result of squashing then merging a <code>feature</code> branch with the <code>main</code> branch.}
146+
accDescr {A Git graph showing the result of squashing then merging a feature branch with the main branch.}
147147
commit id: '4631ebc'
148148
commit id: 'ee406ac'
149149
commit id: '62440f8'
@@ -168,7 +168,7 @@ Starting with:
168168

169169
```mermaid
170170
gitGraph
171-
accDescr {A Git graph showing the <code>main</code> branch with a <code>feature</code> branch branching off at the second commit of <code>main</code>.}
171+
accDescr {A Git graph showing the main branch with a feature branch branching off at the second commit of main.}
172172
commit id: '4631ebc'
173173
commit id: 'ee406ac'
174174
branch feature
@@ -186,7 +186,7 @@ branch and adding them to `main`:
186186

187187
```mermaid
188188
gitGraph
189-
accDescr {A Git graph showing the result of rebasing a <code>feature</code> branch with the <code>main</code> branch.}
189+
accDescr {A Git graph showing the result of rebasing a feature branch with the main branch.}
190190
commit id: '4631ebc'
191191
commit id: 'ee406ac'
192192
commit id: '62440f8'

08-rebase.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ The git history now looks something like this:
122122

123123
```mermaid
124124
gitGraph
125-
accDescr {A Git graph showing the <code>main</code> branch with the <code>add_plot_script</code> branch branching off at the first commit of <code>main</code>.}
125+
accDescr {A Git graph showing the main branch with the add_plot_script branch branching off at the first commit of main.}
126126
commit id: 'ed14d18'
127127
branch add_plot_script
128128
checkout add_plot_script
@@ -427,7 +427,7 @@ PR was merged with `main`:
427427

428428
```mermaid
429429
gitGraph
430-
accDescr {A Git graph showing the <code>main</code> branch with the <code>add_plot_script</code> branch branching off at the first commit of <code>main</code>.}
430+
accDescr {A Git graph showing the main branch with the add_plot_script branch branching off at the first commit of main.}
431431
commit id: 'ed14d18'
432432
branch add_plot_script
433433
checkout add_plot_script
@@ -444,7 +444,7 @@ This is what we are aiming for:
444444

445445
```mermaid
446446
gitGraph
447-
accDescr {A Git graph showing the <code>main</code> branch with the <code>add_plot_script</code> branch branching off at the second commit of <code>main</code>.}
447+
accDescr {A Git graph showing the main branch with the add_plot_script branch branching off at the second commit of main.}
448448
commit id: 'ed14d18'
449449
commit id: '4rtzk8g'
450450
branch add_plot_script

md5sum.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
"index.md" "4f0b01239324c43e254def95f89923a9" "site/built/index.md" "2025-01-20"
66
"episodes/00-repo-access.md" "e6524e4a06479f449a44fda3b440f690" "site/built/00-repo-access.md" "2025-02-25"
77
"episodes/01-issues.md" "f22fad38ef9a49a94df0d58619afdf2c" "site/built/01-issues.md" "2025-02-26"
8-
"episodes/02-branching.md" "9d856f39bfd5a2bef79ed5ed15bfb954" "site/built/02-branching.md" "2025-02-03"
8+
"episodes/02-branching.md" "4c1ea5d3b2a27714d1063d0c552ee7e9" "site/built/02-branching.md" "2025-02-27"
99
"episodes/03-feature-branch.md" "02088db1460b479504a503c8f5bff768" "site/built/03-feature-branch.md" "2025-02-26"
1010
"episodes/04-review.md" "a05866f6f104273960133396026217c5" "site/built/04-review.md" "2025-02-26"
1111
"episodes/Break.md" "3f756cfaee9cc1c397381668102aaea0" "site/built/Break.md" "2025-01-10"
12-
"episodes/07-history.md" "0508dec8266d080ddecf8aad9014394d" "site/built/07-history.md" "2025-02-26"
12+
"episodes/07-history.md" "ef281c80f9126ca785bfa170e8c27a62" "site/built/07-history.md" "2025-02-27"
1313
"episodes/05-forks.md" "b8ec1e10b8ce0513086cc32693865559" "site/built/05-forks.md" "2025-02-26"
14-
"episodes/06-conflict.md" "9d042c37ff659d9e9b5f2a684008e7cb" "site/built/06-conflict.md" "2025-02-26"
14+
"episodes/06-conflict.md" "a4365117d4de8ba82e8696d4a2bfeb3c" "site/built/06-conflict.md" "2025-02-27"
1515
"episodes/End.md" "42f2019c55b38db5ec0eab909b6bca4d" "site/built/End.md" "2025-01-09"
16-
"episodes/08-rebase.md" "facb2718937ca770165b2a5435b556c0" "site/built/08-rebase.md" "2025-01-22"
16+
"episodes/08-rebase.md" "c968e3b7973b5cafa1b0b5b3a9721242" "site/built/08-rebase.md" "2025-02-27"
1717
"episodes/09-pre-commit.md" "99096b6d10f4f7c1f6f5bfa72f728e45" "site/built/09-pre-commit.md" "2024-12-02"
1818
"instructors/instructor-notes.md" "ea8646b0d153b93f42e0a7dff1b1747b" "site/built/instructor-notes.md" "2025-02-26"
1919
"learners/discuss.md" "aaef6991af918125ae722d3ce4e36443" "site/built/discuss.md" "2024-11-19"

0 commit comments

Comments
 (0)