EBC Exercise 16 git - Fork and Pull

In a previous exercise you learned how to use git locally and with a shared repository. Here you will work though an example of using git collaboratively using the Fork and Pull workflow. This method works better when working with large groups.

Much of the material here has come from help.github.com/articles/fork-a-repo and help.github.com/articles/fork-a-repo.

Forking a Repo
host$ git clone https://github.com/username/gitLearnFork.git host$ cd gitLearnFork host$ git remote add upstream git@github.com:MarkAYoder/gitLearnFork.git host$ git fetch upstream
 * Go to github.com/MarkAYoder/gitLearnFork
 * Click the Fork button in the upperright
 * Clone your fork
 * Configure remotes
 * Pull in changes not present in your local repository, without modifying your files

More things you can do
host$ git push origin master host$ git fetch upstream host$ git merge upstream/master
 * Push commits to your remote repository stored on GitHub
 * Fetch any new changes from the original repository
 * Merge any changes fetched into your working files

The Pull Request
host$ nano helloWorld.py host$ git add helloWorld.py host$ git commit -m "Put something meaningful here" host$ git push host$ git fetch upstream host$ git merge upstream/master
 * Add your name to helloWorld.py in your gitLearnFork repo
 * Commit it to your local repo
 * Go to your repo on github and initiate a Pull Request.
 * Wait for a response and then

Congratulations, you've done a Fork and Pull.