diff options
| author | Chris Rebert <[email protected]> | 2013-08-20 13:45:52 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2013-08-20 13:45:52 -0700 |
| commit | 63f8c8caabe74159e85aafc1c244837850b8103c (patch) | |
| tree | 4de8398f9e200a944150d76c56de40b8a4e039e8 | |
| parent | 6735dc8c16ed337e406cd2554cc2ae261e742d77 (diff) | |
| download | bootstrap-63f8c8caabe74159e85aafc1c244837850b8103c.tar.xz bootstrap-63f8c8caabe74159e85aafc1c244837850b8103c.zip | |
CONTRIBUTING: reflect move away from *-wip branch style of development
Per http://blog.getbootstrap.com/2012/12/10/bootstrap-3-plans/ :
> * Drop the `*-wip` branch style of development.
| -rw-r--r-- | CONTRIBUTING.md | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 060a3bd91..2cbd6e32c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,21 +15,13 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso -## Key branches - -- `master` is the latest, deployed version. -- `gh-pages` is the hosted docs (not to be used for pull requests). -- `*-wip` is the official work in progress branch for the next release. - - - ## Pull requests -- Try to submit pull requests against the latest `*-wip` branch for easier merging -- CSS changes must be done in .less files first, never just the compiled files -- If modifying the .less files, always recompile and commit the compiled files bootstrap.css and bootstrap.min.css +- CSS changes must be done in `.less` files first, never just the compiled `.css` files +- If modifying the `.less` files, always recompile and commit the compiled files `bootstrap.css` and `bootstrap.min.css` - Try not to pollute your pull request with unintended changes--keep them simple and small - Try to share which browsers your code has been tested in before submitting a pull request +- Pull requests should always be against the `master` branch, never against `gh-pages`. |