From 3afbdabd66f2fc4c5b93d2160c3d1471a0dcfb24 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 5 Mar 2014 16:24:19 -0800 Subject: [PATCH] fixes to coding instructions in contributing --- CONTRIBUTING.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 171b1274b8..c86ae8335a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,18 +6,21 @@ Contributing === 1. Fork the repository to your own GitHub account. 2. Clone your fork of the repository locally + ``` git clone git://github.com/USERNAME/hifi.git ``` 3. Create a new branch + + ``` + git checkout -b new_branch_name ``` - git checkout -b new_branch_name - ``` 4. Code * Follow the [coding standard](https://github.com/highfidelity/hifi/wiki/Coding-Standard) 5. Commit * Use [well formed commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) 6. Update your branch + ``` git remote add upstream https://github.com/highfidelity/hifi git pull upstream master @@ -25,10 +28,11 @@ Contributing Resolve any conflicts that arise with this step. 7. Push to your fork + ``` git push origin master ``` - + Reporting Bugs === 1. Always update to the latest code on master, it is possible the bug has already been fixed!