Fixing some issues
It's been called to our attention, so let's fix the typo. The process should now begin to become familiar to you. You'll need to:
- Create a new branch
- Make your edits
- Commit your changes
- Make a pull request
git checkout -b <branch name>- Make your edits
git add ___git commit -m _____your changesgit push origin <branch name>- Make a pull request
Make your own branch and PR for one of the issues that another member is working on. This will be for you to merge in last to demonstrate a merge conflict.
This time, when you merge the pull request, put
closes #___-- where __ is the issue number -- in the "Confirm Merge" message. Show your team how the issue is now closed.When it comes to merging your PR, GitHub will have a message about how it can't merge since there's a conflict with master. Explain to your team about how sometimes, we'll confuse git. Resolve the conflict locally, and show your team how it's really just about helping git know what the file should actually look like.
Make your own branch and PR for one of the issues that another member is working on. This will be for you to merge in last to demonstrate a merge conflict.
This time, when you merge the pull request, put
closes #___-- where __ is the issue number -- in the "Confirm Merge" message. Show your team how the issue is now closed.When it comes to merging your PR, GitHub will have a message about how it can't merge since there's a conflict with master. Explain to your team about how sometimes, we'll confuse git. Resolve the conflict locally, and show your team how it's really just about helping git know what the file should actually look like.
Browse around on the repo online and see how the recipes book is turning out!
Lead your team in a show-and-tell of different libraries that are on GitHub. Ask first what they've heard of or used, and pull up their repos online. Bootstrap might be a a great candidate for this. Or, for members more familiar with data analysis, ggplot2, jupyter/iPython notebook. Show how contributions have been made to these projects using similar workflows to what we just did.
Congratulate team members on their shiny green contribution box on their profiles.
Lead your team in a show-and-tell of different libraries that are on GitHub. Ask first what they've heard of or used, and pull up their repos online. Bootstrap might be a a great candidate for this. Or, for members more familiar with data analysis, ggplot2, jupyter/iPython notebook. Show how contributions have been made to these projects using similar workflows to what we just did.
Congratulate team members on their shiny green contribution box on their profiles.
Revel in the glory of your team's first git collaboration! Celebrate, discuss, review, ask questions, and take a break.