Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the analogy of pull requests and editing a shared document #469

Merged
merged 4 commits into from
Dec 4, 2024
Merged

Add the analogy of pull requests and editing a shared document #469

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0354e60
Add the analogy of pull requests and editing a shared document
anenadic Dec 4, 2024
6067119
Update episodes/collaborating-team.md
anenadic Dec 4, 2024
e6f6fa1
Update episodes/collaborating-team.md
anenadic Dec 4, 2024
d4f35c1
Remove semantic line breaks
anenadic Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions episodes/collaborating-team.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ 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"?
Expand Down
Loading