- Fork this repo on Github
- Change into your Code directory. Do not do the following from inside another Github repo.
- Clone your repo from Github to your local machine using
git clone git@github.com:YOUR_USERNAME/ga_git_first_turnin.git
- Add a 'remote' called 'upstream' using
git remote add upstream git@github.com:tibbon/ga_git_first_turnin.git
. This will allow you to pull in changes that I might make later - Create a new file in your
ga_git_first_turnin
directory called 'cats.txt' - Stage this file for a commit with
git add cats.txt
- Create a new commit with
git commit -m "Created cats.txt"
- Push your new commit to your Github repo with
git push origin master
- Create a new file called dogs.txt that contains the names of three dogs.
- Stage this file for commit
- Create a new commit with a good commit message.
- Push this commit to Github
- Create a new branch called my_fish with
git checkout -b my_fish
- Add a file called fish.txt with the contents having three types of fish
- Stage this file for commit
- Create a new commit
- Push this commit to a new branch on github with
git push origin my_fish
- Create a pull request on Github by revisiting my repo and click "Pull Request" for your
my_fish
branch. - Change back to your master branch with
git checkout master
- Merge changes from branch my_fish into master with
git merge my_fish
This workflow is roughly how you'll turn in quizzes, homework and assignments.
If you wish to pull in additional changes that I have made do git pull upstream master
from your repo.