Skip to content

Commit

Permalink
Merge pull request necolas#552 from battaglr/remove-v1-references
Browse files Browse the repository at this point in the history
Remove `v1` references
  • Loading branch information
jonathantneal committed Mar 25, 2016
2 parents 1a3af2f + 77f3463 commit 076c8ec
Showing 1 changed file with 2 additions and 11 deletions.
13 changes: 2 additions & 11 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ accurate comments, etc.) and any other requirements (such as test coverage).
Follow this process if you'd like your work considered for inclusion in the
project:

1. [Fork](https://help.github.com/articles/fork-a-repo/) the project, clone your fork,
and configure the remotes:
1. [Fork](https://help.github.com/articles/fork-a-repo/) the project, clone your
fork, and configure the remotes:

```bash
# Clone your fork of the repo into the current directory
Expand Down Expand Up @@ -128,10 +128,6 @@ project:
Be sure to add a test to the `test.html` file if appropriate, and test
your change in all supported browsers.

```bash
git pull --rebase upstream master
```

5. Locally rebase the upstream development branch into your topic branch:

```bash
Expand All @@ -147,9 +143,6 @@ project:
10. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
with a clear title and description.

Please submit a separate pull request for any appropriate changes required
in the `v1` branch for legacy browsers.

**IMPORTANT**: By submitting a patch, you agree to allow the project owner to
license your work under the same license as that used by the project.

Expand Down Expand Up @@ -185,8 +178,6 @@ cutting new releases.
4. Do not use GitHub's merge button. Apply the patch to `master` locally
(either via `git am` or by checking the whole branch out). Amend minor
problems with the author's original commit if necessary. Then push to GitHub.
5. If a patch should be included in `v1`, cherry-pick the commits or manually
apply if all else fails.

### Releasing a new version

Expand Down

0 comments on commit 076c8ec

Please sign in to comment.