From 255a50baeebbacc9d8c92382eb7d846b2087430c Mon Sep 17 00:00:00 2001 From: Gregg Van Hove and Tim Jarratt Date: Thu, 3 Oct 2013 12:30:07 -0700 Subject: [PATCH] Update contribution guidelines for pull requests [Finish #45961121] --- CONTRIBUTING.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 11ca32d2..654df16e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -107,5 +107,10 @@ Jasmine uses Node.js with a custom runner to test outside of a browser. 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. + Note that we use Travis for Continuous Integration. We only accept green pull requests.