Skip to content

Commit 903d192

Browse files
committed
differences for PR #155
1 parent 3d2a868 commit 903d192

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

04-rewriting_history.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,8 @@ copy of a repository.
312312

313313
### Removing branches once you are done with them is good practice
314314

315-
Over time, you will accumulate lots of branches to implement different features in you
316-
code. It is good practice to remove them once they have fulfil their purpose. You can do
315+
Over time, you will accumulate lots of branches to implement different features in your
316+
code. It is good practice to remove them once they have fulfilled their purpose. You can do
317317
that using the `-D` flag with the `git branch` command:
318318

319319
```bash

07-managing_contributions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Developer 2 -- "Hmmm... if we tweak things here then it might be faster."
6666

6767
Pull requests are a GitHub feature which allows collaborators tell each other about changes that have been pushed to a branch in a repository. Similar to **issues**, an open pull request can contain discussions about the requested changes and allows collaborators to review proposed amendments and follow-up commits before changes are either rejected or accepted and merged into the base branch.
6868

69-
:::::::::::::::::::::::::::::::::::::: objectives
69+
:::::::::::::::::::::::::::::::::::::: discussion
7070

7171
## Why the name?
7272

08-continuous_integration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ on:
129129
```
130130
131131
This will additionally trigger the workflow to run when a pull request is created. The
132-
"push" and "pull\_request" triggers are probably the most commonly used however, there
132+
`push` and `pull_request` triggers are probably the most commonly used however, there
133133
are a great many available (see [GitHub Docs: Events that trigger
134134
workflows][actions-triggers]). This is an example of where GitHub Actions goes further
135135
than most CI systems as you can automate pretty much any behaviour in a repository.
@@ -274,7 +274,7 @@ take things further by implementing some policy in the form of a "branch protect
274274
rule". We can use this to put two restrictions in place:
275275

276276
1. No code can be pushed directly to the `main` branch, it must always be added via pull
277-
request.
277+
request.
278278
2. All CI workflows must succeed in order for PRs to be allowed to merge.
279279

280280
Combined together these rules mean that **no code can end up in the `main` branch if it

md5sum.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"episodes/01-collaborating_with_git.md" "b9d1e525a1019a4d65d5c6c832cf9aa4" "site/built/01-collaborating_with_git.md" "2026-01-28"
88
"episodes/02-branching_merging.md" "13d298ecafff6759ce64cefdb3d2cd92" "site/built/02-branching_merging.md" "2026-01-28"
99
"episodes/03-merge_conflicts.md" "eb9a21399cbee1e268ae0716132e45f7" "site/built/03-merge_conflicts.md" "2026-01-28"
10-
"episodes/04-rewriting_history.md" "afb7b1d917416531e47eed761c7f03f1" "site/built/04-rewriting_history.md" "2026-01-28"
10+
"episodes/04-rewriting_history.md" "3cf430c1da1144b5fefe8c4fb18b602f" "site/built/04-rewriting_history.md" "2026-01-30"
1111
"episodes/05-pulling_pushing.md" "b8c48be3fbbbe83aac8438dfed6a3090" "site/built/05-pulling_pushing.md" "2026-01-28"
1212
"episodes/06-first_session_end.md" "23bef32763ef61227f4453f3e653e71c" "site/built/06-first_session_end.md" "2025-11-13"
13-
"episodes/07-managing_contributions.md" "b97c35aafbef67a001c3b364940b97bd" "site/built/07-managing_contributions.md" "2026-01-28"
14-
"episodes/08-continuous_integration.md" "a85d665ea5dcfa570f97481ff3ee03a3" "site/built/08-continuous_integration.md" "2026-01-28"
13+
"episodes/07-managing_contributions.md" "f04d56dc9ce27a20d99f7d6ff2638288" "site/built/07-managing_contributions.md" "2026-01-30"
14+
"episodes/08-continuous_integration.md" "f2fe1dbdb1ec2ddf52bf128e2727ea76" "site/built/08-continuous_integration.md" "2026-01-30"
1515
"episodes/09-releases_tags.md" "b3c01519512f575f6a65fe12617bba43" "site/built/09-releases_tags.md" "2026-01-28"
1616
"episodes/10-collaborative_development.md" "5a65ba4870f9ad3b6466a3e8ee6da167" "site/built/10-collaborative_development.md" "2026-01-28"
1717
"episodes/11-second_session_end.md" "013ad4a6db48f16b26fdc51d7035eb1f" "site/built/11-second_session_end.md" "2025-11-13"

0 commit comments

Comments
 (0)