diff --git a/HOW-TO-CONTRIBUTE.md b/HOW-TO-CONTRIBUTE.md deleted file mode 100644 index 7694b0728752159a88fe792ef1fe3f1d84d6b814..0000000000000000000000000000000000000000 --- a/HOW-TO-CONTRIBUTE.md +++ /dev/null @@ -1,18 +0,0 @@ -Development is handled through GitHub - -All code changes must be committed via git to a local fork -and contributed back to the project via a pull request. - -Ideally each developer should have a fork of the project -on GitHub where they can push changes. - -In your local clone: - - * git pull origin develop - * git checkout -b topics/whatever-you-work-on (or bugfix/NUM — for bugs) - * write code and commit - * git push origin topics/whatever-you-work-on - * go on github.com/github.unl.edu and open a pull request from your branch to develop - * have someone else review - -Another developer will review your changes and merge in to the develop branch. diff --git a/README.md b/README.md index 93f99805aec9d86ed07599605acfa38251bc39ab..fb118e8fb2519e73d4033a27d4604df6dabb02ae 100644 --- a/README.md +++ b/README.md @@ -131,3 +131,22 @@ In this example the web root is /Library/WebServer/Documents and Apache runs as * wysiwyg/editors/js/tinymce-3.js - Comment out the part that switches wrappers from table-based to div. We need the original TinyMCE code for the PDW toggle plugin to work + +## How to Contribute + +Development is handled through GitHub + +All code changes must be committed via git to a local fork and contributed back to the project via a pull request. + +Ideally each developer should have a fork of the project on GitHub where they can push changes. + +In your local clone: + + * git pull origin develop + * git checkout -b topics/whatever-you-work-on (or bugfix/NUM — for bugs) + * write code and commit + * git push origin topics/whatever-you-work-on + * on github open a pull request from your branch to develop + * have someone else review + +Another developer will review your changes and merge in to the develop branch.