uzair-ashraf / c819_hackathon1

c819_hackathon1

complete the project assigned to your group. All projects MUST be in OOP

• 1 person fork this repo.
• other people in the team clone their repo
• base your branches off the dev branch
• make sure to make a figma and supply the link to the figma in this readme at the top.

Proper steps for branching / merging

• start from dev
• maker a feature branch named after the feature you are working on
• add/commit/push often
• after done with feature, make a pull request from your feature branch back to dev
• have someone else review the code and verify it works
  • make sure your current branch is committed
  • check out dev git checkout dev
  • update dev . git pull origin dev
  • make a release candidate branch. for example rc20190805_1642 (august 8th 2019 at 4:42 pm) git checkout -b rc########
  • merge in the target branch git pull origin <feature branch>
  • test code on page
  • if that works, merge the next thing, if anything
  • if all work, check out dev
  • then merge your rc branch into dev
  • all new features should be based on dev

Teams

Team 1

• Project : Bears Versus Babies
• members:
  • Christine Le
  • Dane Maison
  • Heondo Kim

Team 2

• Project : Chariot Races
• members:
  • Christie Hui
  • Brena Patel
  • Aaron Domingo

Team 3

• Project : Oh no, Zombies!
• members:
  • Edward Lee
  • Adison Lay
  • Jan Ong

Team 4

• Project : Sagrada
• members:
  • Kevin Ihm
  • Joseph Moberly
  • Lana Porina
  • Mitch O'Hair

Team 5

• Project : Imhotep
• members:
  • Anjaleena Barclay
  • Noel Carino
  • Tarun Padath
  • Michael Chang

Team 6

• Project : Gemstone Mining
• members:
  • James Cho
  • Uzair Ashraf
  • Sean Hughes