Commit 36c15674 authored by Michael McAndrew's avatar Michael McAndrew

adding documentation on branches and doing a release

parent 3a8fc5bd
......@@ -4,8 +4,18 @@ All new code, etc. should be developed locally, commited to this repository, tes
You can use www-test to experiment with ad-hoc configuration changes (e.g. to views, permissions, etc.) but note that many peole have access to www-test, and it gets over written with data from www-prod on a regular basis, e.g. when testing upgrades of CiviCRM. Therefore, you should NOT assume that your config changes will be on www-test next time you look.
Since the volume of development on the website quite low, it is often OK to make small and quick changes directly on master. However, if you are making more significant or independent changes (say over a few days) it is safer to create a branch for the development and merge it to master when ready.
All custom modules should be added to the sites/all/modules/custom directory.
##Releases is served from www-prod. All files are owned by the co user. To release new code on the master branch, do something like this:
user@www-prod~$ cd /var/www/civicrm-website-org
user@www-prod/var/www/civicrm-website-org$ sudo -s -u co
co@www-prod/var/www/civicrm-website-org$ git pull
#Syncing to test and local environments
Syncing to www-test and local development environments is done in the standard way (mysqldump and restore the databases and rsync/copy the files). You can then do a git pull (and so on) to check out appropriate code.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment