Skip to content

Commit 8480609

Browse files
committed
markdown source builds
Auto-generated via `{sandpaper}` Source : d001e32 Branch : main Author : Dimitrios Theodorakis <[email protected]> Time : 2025-01-09 16:48:58 +0000 Message : MetOffice#41 Adds in a callout clarifying who can merge during the review episode
1 parent 5146935 commit 8480609

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

04-review.md

+15
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,21 @@ in the Version Control with Git lesson:
143143

144144
![](fig/pr-review-5.png){alt='A screenshot of a PR showing the Conversations tab. The PR is ready to merge.'}
145145

146+
::: callout
147+
148+
## Who presses the merge button?
149+
150+
In this case both the contributor and reviewer have
151+
write access to the repository.
152+
This means they can both merge and close the PR
153+
and it is up to your team to decide whether the contributor
154+
or the reviewer does the merge as part of your working practices.
155+
156+
When using the forking model later the reviewer always
157+
merges the PR as the contributor will not have sufficient permissions.
158+
159+
:::
160+
146161
When your PR is merged the Conversations tab will show:
147162

148163
![](fig/pr-review-6.png){alt='A screenshot of a PR showing the Conversations tab. The notification tells us our PR has been successfully merged and closed.'}

md5sum.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"episodes/01-issues.md" "a2cd906c1fd69b1be899f6e352334b0d" "site/built/01-issues.md" "2025-01-09"
88
"episodes/02-branching.md" "67c14934ca1f8eced9b2c82159d54842" "site/built/02-branching.md" "2025-01-09"
99
"episodes/03-feature-branch.md" "2aa2c1b8bd6bf77202e3dfecc69eca2d" "site/built/03-feature-branch.md" "2025-01-09"
10-
"episodes/04-review.md" "1b99410868758ff2a0c92ed59383dd06" "site/built/04-review.md" "2025-01-09"
10+
"episodes/04-review.md" "90bf3c25ead2368b8664603c6667a457" "site/built/04-review.md" "2025-01-09"
1111
"episodes/Break.md" "96f3c03ec9cd646c6366f840b7f21107" "site/built/Break.md" "2025-01-09"
1212
"episodes/05-forks.md" "47b583e34640bfbf92abb84c2c97540c" "site/built/05-forks.md" "2025-01-09"
1313
"episodes/06-conflict.md" "a8d0c3432d9ba941acb7607a264f117a" "site/built/06-conflict.md" "2024-12-03"

0 commit comments

Comments
 (0)