Collaborative Version Control - Distributed
Last updated on 2024-06-26 | Edit this page
Overview
Questions
- How can I use version control to collaborate with external collaborators?
Objectives
- Understand distributed workflow and when to use it
Exercise: Working as an external contributor (in pairs)
- PERSON A: Create an issue in Person B’s repository
- PERSON A: Fork the repository to their own (= Person A’s) account
- PERSON A: Clone the repository, make changes, push them back to the fork
- PERSON A: Submit a Pull Request from the fork to the original repository
- PERSON B: Make a change in the original repository in the same place as person A’s proposed changes
- PERSON A: Solve the merge conflict in the Pull Request
- PERSON B: Review/Approve the Pull Request
- PERSON B: merge the Pull Request
Key Points
- Use distributed flow for external collaborations