Milestone 9: Source Control

Due Date: October 29 @11:59pm
Grading: Individual

You must watch the Git and Github lecture before working on this milestone.

By this date you should have

  1. Setup your github email correctly. Your most recent commits do not show a grey octocat avatar in github.
  2. Have a shared git repo in github,
  3. The code in the repo builds, something.
  4. Every team member can check out the code, build it, and run it on their laptop.
  5. Every team member has made a change to the code and pushed it to github.
  6. Every team member has pulled in changes from other members.
  7. Every team member has experienced and resolved a merge conflict.

For the merge conflict just have someone else in the time change some line in the code and push it. Then, before you pull, make sure you change that same line (to something else) and commit it. Then try to pull. You will see a merge conflict. Resolve it. Commit your changes. Push.

From here on out everyone in the team will be using git as part of their workflow. Remember, your final grade is largely based on your git commit log. It shows us everything you did.

Coding Style Guide

Since you are about to start coding as a team, it is useful if your team also choses a style guide to follow. You can choose one of Google's style guides, or find a different one. Add a link to your chosen guide from your Readme.md. Some IDEs will automatically format your code to fit a chosen style. See if yours does that.

Deliverables

You have to be able to

  1. pull from the shared repo,
  2. build,
  3. run application locally (laptop or emulator)
  4. commit to shared repo,
  5. push to the shared repo,
  6. merge your branch into master, via pull request or regular merge,
  7. and resolve a merge conflict.

Grading Rubric

Deliverable Points lost if you don't deliver
Username appears in git log on github repo. 100
Git/github email setup correctly to match. 50
Can build and run code on laptop. Show during our meeting, if I ask you to. 100
User has Merge commit (two parents) in github log. 30
Has resolved a merge conflict (we can't actually check this AFAIK, so we will have to trust you did it). 30

Minimum grade is 0.