Skip to content

Commit

Permalink
Update episodes/collaborating-team.md
Browse files Browse the repository at this point in the history
Co-authored-by: Toby Hodges <[email protected]>
  • Loading branch information
anenadic and tobyhodges authored Dec 4, 2024
1 parent 0354e60 commit 6067119
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions episodes/collaborating-team.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,14 @@ On GitHub, these units of discussion, review,
and acceptance/rejection of the changes within a branch
are called _Pull Requests_.

GitHub pull requests is analogous to tracking changes in a shared online document -
both involve proposing, reviewing, and finalising updates collaboratively.
Pull requests are analogous to tracking changes in a shared online document -
both involve proposing, reviewing, discussing, and finalising updates collaboratively.
In a shared document, edits are submitted for review by a proposer, akin to creating
a pull request in GitHub, where changes are proposed via a branch.
Reviewers in both cases look at the proposed changes, provide feedback via comments,
request modifications, and resolve conflicts before final approval.
Once approved, changes are integrated into the main document or `main` branch,
request modifications, and may need to resolve conflicts between multiple competing versions
before final approval.
Once approved, changes are integrated into the main document (the `main` branch in your lesson repsository),
with version histories in both systems providing an audit trail of contributions.
This structured workflow ensures quality and accountability in collaborative efforts.

Expand Down

0 comments on commit 6067119

Please sign in to comment.