library-mirrors/normalize.css
1
0
Fork 0
mirror of https://github.com/necolas/normalize.css.git synced 2024-12-25 15:14:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #552 from battaglr/remove-v1-references

Browse Source 
Remove `v1` references
This commit is contained in:
Jonathan Neal 2016-03-24 23:51:37 -04:00
commit 076c8ecb80
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CONTRIBUTING.md
View File

@ -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 Follow this process if you'd like your work considered for inclusion in the
project: project:
1. [Fork](https://help.github.com/articles/fork-a-repo/) the project, clone your fork, 1. [Fork](https://help.github.com/articles/fork-a-repo/) the project, clone your
and configure the remotes: fork, and configure the remotes:
```bash ```bash
# Clone your fork of the repo into the current directory # Clone your fork of the repo into the current directory
@ -128,10 +128,6 @@ project:
Be sure to add a test to the `test.html` file if appropriate, and test Be sure to add a test to the `test.html` file if appropriate, and test
your change in all supported browsers. your change in all supported browsers.
```bash
git pull --rebase upstream master
```
5. Locally rebase the upstream development branch into your topic branch: 5. Locally rebase the upstream development branch into your topic branch:
```bash ```bash
@ -147,9 +143,6 @@ project:
10. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/) 10. [Open a Pull Request](https://help.github.com/articles/using-pull-requests/)
with a clear title and description. 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 **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. license your work under the same license as that used by the project.
@ -185,8 +178,6 @@ cutting new releases.
4. Do not use GitHub's merge button. Apply the patch to `master` locally 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 (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. 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 ### Releasing a new version