Skip to content

Commit

Permalink
updating wip branch contributing instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
alademann committed Apr 1, 2013
1 parent 42c26c1 commit 9bf603d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso

- `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.
- `*sass-wip` is the official work in progress branch for the next Sass release.



## Notes on the repo

As of v3.0.0, SASS Bootstrap's documentation is powered by Jekyll templates and built dynamically by Github Pages before each release.
As of v3.0.0, Saas Bootstrap's documentation is powered by Jekyll templates and built dynamically by Github Pages before each release.



## Pull requests

- Try to submit pull requests against the latest `*-wip` branch for easier merging
- Try to submit pull requests against the latest `*sass-wip` branch for easier merging
- Any changes to the docs must be made to the Mustache templates, not just the compiled HTML pages
- CSS changes must be done in .scss files first, never just the compiled files
- Try not to pollute your pull request with unintended changes--keep them simple and small
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ $ compass watch -r compass-growl

## Contributing

Please submit all pull requests against *-wip branches. If your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo).
Please submit all pull requests against *sass-wip branches. If your pull request contains JavaScript patches or features, you must include relevant unit tests. All HTML and CSS should conform to the [Code Guide](http://github.com/mdo/code-guide), maintained by [Mark Otto](http://github.com/mdo).



Expand Down

0 comments on commit 9bf603d

Please sign in to comment.