Note: This is a pair programming activity.
Let's apply what we've learned from class to share and update each other's code. With a partner, you're going going to alternate between who 'drives' and who 'navigates' while following the requirements under "Exercise" below. The goal will be to create a project, have a partner fork, clone, and edit the project, submit the changes as a pull request, and then have the changes merged.
Be sure to look at the previous lesson for notes and helpful hints.
Partners will be referred to as partner1 and partner2.
- Follow instructions below
- At the end you will each have an identical repository that you each have contributed to from your own computers.
With partner1 driving:
-
create a folder called
git-and-github-practice -
within that folder create the following files
index.html,style.css, andscripts.js- 'cd git-and-github-practice'
-
copy and paste the code from the starter-code from the
index.htmlandstyle.cssinto your own -
add
// JavaScript to be addedto yourscripts.jsfile and link to your JavaScript file -
initiate a git repository, commit your changes, and push to GitHub
With partner2 driving, from their computer:
- get your partners link to the GitHub repository and fork and clone it
- open the project and make the 'Join Our Mailing List' button prompt the user for an email
- commit your changes and submit a pull request back to partner1
With partner1 driving:
- merge the pull request from the GitHub interface
With partner2 driving:
- create a folder called
git-and-github-practice-two - within that folder create the following files
index.html,style.css, andscript.js - copy and paste the code from the merged pull request files (of your partners
git-and-github-practiceproject) from each of the appropriate files to your own - initiate a git repository, commit your changes, and push to GitHub
Note: Partner2 should now have the solution from Part 1 locally
With partner1 driving:
- get your partner's link to the new GitHub repository - fork and clone it
- open the project and make sure that after the user enters their email, the button changes its text to say, "Thanks for your email!"
- commit your changes and submit a pull request back to partner2
With partner2 driving:
- merge the pull request from the GitHub interface
Bonus:
- use the syncing a fork documentation to update partner2's local version of
git-and-github-practicewithout copying and pasting any code - push the updated local copy to GitHub
We've given you the HTML/CSS needed to get going in the starter-code.
There is no screenshot for this lab. You should have two separate GitHub repositories that have merged pull requests. Try not to, but if you need, peak at the command line/code answers to part 1 for help.
- Have you and your partner both cd back to git-and-github-practice.
- Each of you create and checkout to a branch, either "css-work", "js-work", or "html-work"
- Make some change to the document your branch describes (style.css for branch "css-work" etc.)
- Commit on that branch
- Push your branch to github
- Create a pull request from your branch to master
- Have your partner merge your pull request!
During the previous exercise, rate your progress on a scale of 1-5 (5 being the highest) for the following criteria:
- Persistence: Do you handle frustration well? Do you independently pursue understanding?
- Organization: Do you thoughtfully implement best coding patterns and practices?
- Collaboration: Do you make an effort solve problems and share your ideas with others?
- Communication: Do you clearly convey your thoughts to others in illustrative and clear ways?
- Self-compassion: Do you make productive use of turning failures into learning opportunities?
- Resourcefulness: Do make an effort to compare and contrast new ideas with ones you already know?