Milestone 5

due at midnight on   +125

For this milestone, I would like you to practice branching and merging in git. You will create a new branch of the code within your repository, and make changes to both the new branch and the master. Then you merge them back together. When finished, the history should clearly show the branch and merge, like this:

Branch and merge example

Branch and merge example

In the image, chronological order is from bottom to top. So “in class work on app” is a commit made on a different branch from “change for demo purpose.” Then they merge back together in “fix conflict after merge.”

More details about how to do this in class on April 6 .