git basics, continued

Part 2: branch, pull request, merge

1. In your existing repo, execute git log just to see what that command gives you.
2. One of you: create a branch, make a change on the branch, and commit and push the changes.
3. Same person: create a GitHub pull request.
4. Somebody else: review and accept the pull request.
5. Everybody: pull the latest stuff from the repo. Take a look at git log. What do you see?
6. Write up Part 2 in the readme.

Part 3: make and resolve a merge conflict

1. In the main branch, members of your group should make changes that generate a merge conflict.
2. Resolve the conflict.
3. Write up Part 3 in the readme. Include questions if you have them.