Skip to content

Commit e926e51

Browse files
Adds in a callout clarifying who can merge during the review episode
1 parent d596a6c commit e926e51

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

episodes/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.'}

0 commit comments

Comments
 (0)