From c260c67e7e4f13169a932b96c51d0dfb8ac21349 Mon Sep 17 00:00:00 2001 From: Aaron Ang Date: Thu, 26 Oct 2017 04:56:44 -0700 Subject: [PATCH] Add instruction to sync local master with upstream --- .github/CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index eb9eb5b5..8bd2f92a 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -16,7 +16,8 @@ Please submit pull requests via feature branches using the semi-standard workflo git clone git@github.com:yourUserName/jasmine.git # Clone your fork cd jasmine # Change directory git remote add upstream https://github.com/jasmine/jasmine.git # Assign original repository to a remote named 'upstream' -git fetch upstream # Pull in changes not present in your local repository +git fetch upstream # Fetch changes not present in your local repository +git merge upstream/master # Sync local master with upstream repository git checkout -b my-new-feature # Create your feature branch git commit -am 'Add some feature' # Commit your changes git push origin my-new-feature # Push to the branch