devonoel/mad-libs

Exercise for team work with Git

Mad Libbing

Getting started

• Get into groups
• One person forks the Mad Libs repo
  • https://github.com/bitmakerlabs/mad-libs
• Owner adds teammates as collaborators with write access
• Everyone in the group clones the repo

Exercise

• Everyone makes a feature branch
• Follow the usual edit-stage-commit process
• When finished,
  • Switch back to master and pull to get the latest code
  • Merge your feature branch into master
  • If there are conflicts, resolve them first

---