diff --git a/README.md b/README.md index c1cc78e..9af7188 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,12 @@ following command: git clone https://github.com//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`. @@ -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 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//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`. diff --git a/alain-7684 b/alain-7684 index 527a5fd..2cf0b2c 100644 --- a/alain-7684 +++ b/alain-7684 @@ -1 +1,2 @@ From Montreal - interested in OpenStack and starting my own mini projects +A change to see if things show up.