PBPL280S21 Exercise 5: git conflicts¶

Fork and clone the exercise repository. You must fork by May 21 5pm.
Add the original repostory as the remote upstream on your clone.
In your clone add your github id to the list of collaborators. Add and commit your changes to your clone. Due this before May 21 5pm
After May 21 5pm pull from upstream.
Take a screenshot of the conflict message (and submit on ilearn).
Resolve the conflict locally (in your clone).
Push to your clone and issue a pull request against upstream. In your pull request message describe how you resolved the conflict.
Post a link to your pull request on ilearn to complete the assignment.

Due: May 26, 5pm pst