@@ -16,29 +16,23 @@ You might want to run 0.3.0 in a branch to make sure you are ok with the theme d
1616
1717## Contributing
1818
19- This repository tracks 2 projects:
2019
21- - ** Jekyll-Bootstrap Framework. **
22- The framework for which users should clone and build their blog on top of is available in the master branch .
20+ To contribute to the framework please make sure to checkout your branch based on ` jb-development ` !!
21+ This is very important as it allows me to accept your pull request without having to publish a public version release .
2322
24- To contribute to the framework please make sure to checkout your branch based on ` jb-development ` !!
25- This is very important as it allows me to accept your pull request without having to publish a public version release.
23+ Small, atomic Features, bugs, etc.
24+ Use the ` jb-development ` branch but note it will likely change fast as pull requests are accepted.
25+ Please rebase as often as possible when working.
26+ Work on small, atomic features/bugs to avoid upstream commits affecting/breaking your development work.
2627
27- Small, atomic Features, bugs, etc.
28- Use the ` jb-development ` branch but note it will likely change fast as pull requests are accepted .
29- Please rebase as often as possible when working .
30- Work on small, atomic features/bugs to avoid upstream commits affecting/breaking your development work .
28+ For Big Features or major API extensions/edits:
29+ This is the one case where I'll accept pull-requests based off the master branch .
30+ This allows you to work in isolation but it means I'll have to manually merge your work into the next public release .
31+ Translation : it might take a bit longer so please be patient! (but sincerely thank you) .
3132
32- For Big Features or major API extensions/edits:
33- This is the one case where I'll accept pull-requests based off the master branch.
34- This allows you to work in isolation but it means I'll have to manually merge your work into the next public release.
35- Translation : it might take a bit longer so please be patient! (but sincerely thank you).
33+ ** Jekyll-Bootstrap Documentation Website.**
3634
37- - ** Jekyll-Bootstrap Documentation Website.**
38- The documentation website at < http://jekyllbootstrap.com > is maintained in the gh-pages branch.
39- Please fork and contribute documentation additions to this branch only.
40-
41- The master and gh-pages branch do not share the same ancestry. Please treat them as completely separate git repositories!
35+ The documentation website at < http://jekyllbootstrap.com > is maintained at https://github.com/plusjade/jekyllbootstrap.com
4236
4337
4438## License
0 commit comments