Skip to main content

Exercise: Too Many Cooks in the Kitchen

Preparation

Process

  1. Look over the repository contents.
  2. Create an issue either
    – proposing a new recipe
    – proposing a change to a recipe
  3. Assign the issue to yourself.
  4. Create a branch with a meaningful name, such as add-pineapple-to-pizza
    – in VS Code GUI
    – in terminal: git checkout -b add-pineapple-to-pizza
    – on github [instructions online]
  5. Add/change the appropriate file.
  6. Commit your change with a meaningful message (Add pineapple #67).
  7. Push your change.
  8. Go through the PR process on github [next slide].

Pull Requests

  1. Create a pull request (PR) from your branch to main.
  2. Make sure it contains the correct changes.
  3. Include Closes #67 in the PR description.
  4. Ask someone to review it.
  5. Make any changes they request.
  6. Once they approve it, squash and merge it, and delete the branch. (This only deletes the branch from github, not from your computer.) You may have to deal with merge conflicts.
  7. Make sure the issue is marked closed.

Help your classmates by reviewing their PRs.

Bonus Slide

Meme showing a divider being removed from tanks of Mentos and Coca-Cola. Title is 'When you are gonna merge two branches after long time'.