Team Up Vocabulary
Word Bank
| branch | main branch | checkout |
| fork | push | pull |
| pull request | code review | merge |
| merge conflict | upstream | conflict markers |
Fill In the Blanks
- A is a parallel version of your project.
- The is the primary shared version.
- To means to switch between branches.
- A is your own copy of someone else’s repository.
- To means to send your commits to GitHub.
- The is the original repo your fork came from.
- A is a proposal to merge your changes into the team repo.
- A is when you read and comment on someone else’s code.
- To means to combine changes from one branch into another.
- A happens when two people changed the same lines.
Quick Checks
-
Put the collaboration workflow in order (number them 1-7):
Open a pull request
Create a branch
Fork the team repo
Review a teammate’s PR
Merge into main
Push your branch
Build your feature -
True or False:
- You should work directly on the main branch:
- Merge conflicts mean someone made a mistake:
- Code review should be constructive and specific:
Stretch: Write a Review Comment
A teammate added this code to change the quiz title. Write a constructive review comment:
document.querySelector("h1").textContent = "my quiz";
Your comment: