From 8afefdd5bd191a18e091a3dbd22721b5368e6172 Mon Sep 17 00:00:00 2001 From: Daniel Lamb Date: Thu, 13 Mar 2014 00:00:21 -0700 Subject: [PATCH] chore(docs): fix confusing steps order --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5181da6..9826603 100644 --- a/README.md +++ b/README.md @@ -69,12 +69,12 @@ To ensure a clear and consistent style of test patterns, every block of code mus * Commit your changes and create a descriptive commit message (the commit message is used to generate release notes, please check out the [commit message conventions](https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y) and the commit message presubmit hook [validate-commit-msg.js](hooks/validate-commit-msg.js)): `git commit -a` * Push your branch to Github: `git push origin my-fix-branch` * In Github, send a pull request to `daniellmb:master` +* If you need to make changes to your pull request, you can update the commit with `git commit --amend`. Then, update the pull request with `git push -f`. * When the patch is reviewed and merged, delete your branch and pull yours — and other — changes from the main (upstream) repository: * Delete your branch in Github, run: `git push origin :my-fix-branch` * Check out the master branch, run: `git checkout master` * Delete your local branch, run: `git branch -D my-fix-branch` * Update your master with the latest upstream version, run: `git pull --ff upstream master` -* If you need to make changes to your pull request, you can update the commit with `git commit --amend`. Then, update the pull request with `git push -f`. That's it! Thank you for your contribution! @@ -102,4 +102,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file +THE SOFTWARE.