Team Up Vocabulary

Word Bank

branch main branch checkout
clone push pull
pull request code review merge
merge conflict collaborator conflict markers

Fill In the Blanks

  1. A is a parallel version of your project.
  2. The is the primary shared version.
  3. To means to switch between branches.
  4. To means to download a repository to your computer.
  5. To means to send your commits to GitHub.
  6. To means to download the latest changes from GitHub.
  7. A is a proposal to merge your branch into main.
  8. A is when you read and comment on someone else’s code.
  9. To means to combine changes from one branch into another.
  10. A happens when two people changed the same lines.

Quick Checks

  • Put the collaboration workflow in order (number them 1-6):
    Open a pull request
    Create a branch
    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: