From 78fe42ac2dda531f3dfa06da06da0b018160abc0 Mon Sep 17 00:00:00 2001 From: Zaven Muradyan Date: Sun, 15 Oct 2017 22:48:57 -0700 Subject: [PATCH] Fix "Before Committing" section of CONTRIBUTING.md. The old contributing docs had a misaligned nested unordered-list, which resulted in it creating a new list instead of being nested under its parent. It also seems like it would be useful to have the "revert your changes" prose as part of the "Before Committing" section, since otherwise people may miss it and have to amend. --- .github/CONTRIBUTING.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 1554a01f..eb9eb5b5 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -129,11 +129,9 @@ The easiest way to run the tests in **Internet Explorer** is to run a VM that ha 1. Ensure all specs are green in browser *and* node 1. Ensure JSHint is green with `grunt jshint` 1. Build `jasmine.js` with `grunt buildDistribution` and run all specs again - this ensures that your changes self-test well - -## Submitting a Pull Request 1. Revert your changes to `jasmine.js` and `jasmine-html.js` - * We do this because `jasmine.js` and `jasmine-html.js` are auto-generated (as you've seen in the previous steps) and accepting multiple pull requests when this auto-generated file changes causes lots of headaches -1. When we accept your pull request, we will generate these files as a separate commit and merge the entire branch into master + * We do this because `jasmine.js` and `jasmine-html.js` are auto-generated (as you've seen in the previous steps) and accepting multiple pull requests when this auto-generated file changes causes lots of headaches + * When we accept your pull request, we will generate these files as a separate commit and merge the entire branch into master Note that we use Travis for Continuous Integration. We only accept green pull requests.