Skip to content

Updated instructions for refreshing our own fork based on https://help.g... #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alainchiasson wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated instructions for refreshing our own fork based on https://help.g... #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40de5b0
Updated instructions for refreshing our own fork based on https://hel…
alainchiasson Apr 10, 2014
57446bd
Update alain-7684
alainchiasson May 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@ following command:

git clone https://github.com/<your username>/contrib-test

3. Using your favorite text editor, add a new file to this project.
3. Add the upstream for the original project:

cd contrib-test
git remote add upstream https://github.com/jesstess/contrib-test

4. Using your favorite text editor, add a new file to this project.

a) Make the name of the file your first name, then a hyphen, then a random
number, for example `jessica-19678`.
Expand All @@ -23,33 +28,43 @@ following command:

I'm from Nashville and interested in contributing to Django!

4. Commit this addition to your fork of the project using the following commands:
5. Commit this addition to your fork of the project using the following commands:

git add <name of file>
git commit -m "Added my open source interests."

5. Push your changes to the remote repository with the following command:
6. Push your changes to the remote repository with the following command:

git push origin HEAD:master
git push origin master

6. Visit the GitHub page for your fork of the project, e.g.
7. Visit the GitHub page for your fork of the project, e.g.

https://github.com/<your username>/contrib-test

Observe that your file is visible in the GitHub web view for the
project.

7. Click the greeen button to create a pull request for your changes. This will
8. Click the greeen button to create a pull request for your changes. This will
take you to a page where you can review your diff and commit message. Click the
green "Create Pull Request" button, leave a comment, and click the green "Send
pull request button".

8. The owner of the project, jesstess, can now review and merge your pull
9. The owner of the project, jesstess, can now review and merge your pull
request. Wait a few minutes for this to happen.

9. Update your fork of the project to see everyone else's changes, using the
following command:
10. Once the pull request has been merged, you need to update your version of the project.
Refresh from the upstream so that you can pull down the changes :

git fetch upstream

11. Merge the changes with your copy of the repository :

git merge upstream/master

NOTE: See https://help.github.com/articles/fork-a-repo for "What is the difference between fetch and pull"

12. Push changes to your github fork :

git pull --rebase
git push origin master

10. Explore the changes with commands like `git log` and `git show`.
13. Explore the changes with commands like `git log` and `git show`.
1 change: 1 addition & 0 deletions alain-7684
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
From Montreal - interested in OpenStack and starting my own mini projects
A change to see if things show up.