differences for PR #469

collaborating-team.md

@@ -104,6 +104,17 @@ On GitHub, these units of discussion, review,
 and acceptance/rejection of the changes within a branch
 are called _Pull Requests_.
 
+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, 
+(optionally) 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.
+
 :::::: spoiler
 
 ## Why "Pull Request"?

md5sum.txt

@@ -19,7 +19,7 @@
 "episodes/preparing.md" "c826ad573f84968191b9393321b65085" "site/built/preparing.md" "2024-11-29"
 "episodes/wrap-up1.md" "4dec2e5878c0c15d4ae23ac3fc5f350f" "site/built/wrap-up1.md" "2024-10-29"
 "episodes/reflecting.md" "fafc8907ab9a8711f22a8069c56fff42" "site/built/reflecting.md" "2024-11-29"
-"episodes/collaborating-team.md" "2171e97f02fbb7139d15854f4daa1745" "site/built/collaborating-team.md" "2024-10-25"
+"episodes/collaborating-team.md" "93bb18eb453c17bb5cd139bb73d8849f" "site/built/collaborating-team.md" "2024-12-04"
 "episodes/collaborating-newcomers.md" "6dd120c6143617a496116c0b31027d08" "site/built/collaborating-newcomers.md" "2024-12-04"
 "episodes/project-management.md" "648584a861fe3d95aa3e4706b0e3c5ed" "site/built/project-management.md" "2024-12-04"
 "episodes/wrap-up2.md" "449fdd1f8dd0e7dfa520a6c435f9240b" "site/built/wrap-up2.md" "2024-05-13"