From 60671199c71652db1d3226709390494031f82d4f Mon Sep 17 00:00:00 2001 From: Aleksandra Nenadic Date: Wed, 4 Dec 2024 11:16:49 +0000 Subject: [PATCH] Update episodes/collaborating-team.md Co-authored-by: Toby Hodges --- episodes/collaborating-team.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/episodes/collaborating-team.md b/episodes/collaborating-team.md index e8fd476fa..7144dbf09 100644 --- a/episodes/collaborating-team.md +++ b/episodes/collaborating-team.md @@ -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.