Skip to content

Commit

Permalink
Merge pull request #1 from gitonaut/master
Browse files Browse the repository at this point in the history
Add section on creating pull requests
  • Loading branch information
rzach committed May 19, 2015
2 parents c3dc3a7 + 1030920 commit 5b1dde5
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion git4phi.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,10 @@ Now you can tell Git to pull changes, not from the remote `origin` but from `ups

git pull upstream master

Now your local clone of `reader/OpenLogic` contains all the changes from the upstream `OpenLogicProject/OpenLogic`. To update these changes also in your own fork n GitHub, simply say
Your local clone of `reader/OpenLogic` contains all the changes from the upstream `OpenLogicProject/OpenLogic`. To update these changes also in your own fork n GitHub, simply say

git push

Having a copy of a repository, and keeping it up-to-date with the original, "upstream" version, is only half the fun. The real advantage of being able to edit your own /fork/ -- rather than just your own /copy/ -- is that your additions and corrections can be incorporated back into the source repository. For instance, you might want to correct a typo, help with some copyediting, or, in a collaborative project, contribute additional material. The editors of the source repository may want to retain control over who gets to contribute what, and so they don't give push access to anyone. But you can work on your own fork, and make those corrections and additions there first.

When you are done, you can send a /pull request/ to the owners of the source repository. GitHub/GitLab remember from which repository your fork was created, and will display if your fork contains changes not in the upstream source repository. When your fork is "ahead" of the original repository, you can send a /pull request/: alert the owners of the source repository that your fork contains changes which they might want to pull, i.e., merge into their repository.

0 comments on commit 5b1dde5

Please sign in to comment.