admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1440 from aaronang/patch-1

Browse Source 
Add instruction to sync local master with upstream
This commit is contained in:
sgravrock
2017-11-02 08:11:47 -07:00
committed by GitHub
parent 554d0efab7 c260c67e7e
commit 3a9d4ee08d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/CONTRIBUTING.md vendored
View File

@@ -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 git clone git@github.com:yourUserName/jasmine.git # Clone your fork
cd jasmine # Change directory cd jasmine # Change directory
git remote add upstream https://github.com/jasmine/jasmine.git # Assign original repository to a remote named 'upstream' 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 checkout -b my-new-feature # Create your feature branch
git commit -am 'Add some feature' # Commit your changes git commit -am 'Add some feature' # Commit your changes
git push origin my-new-feature # Push to the branch git push origin my-new-feature # Push to the branch