At the 7/13/2015 developer meeting, we discussed the following:
Single Shared Development Branch
- A single shared development branch will be created in each of the NDS repositories
Personal Development Branches
- There can be as many as needed/useful (usually one per feature or one per bug fix)
- The name of the branch should include the developer's userid so the owner can be easily identified
- Always write good commit messages
- Commits will always be associated with defined work
Master
- Never break master
- Merge to master for significant milestones after discussion with team
- Tags will be created on master for major milestones (releases)
Normal Lifecycle
- Developer will branch from the shared development branch when starting a new coding effort (new feature or bug fix)
- Developer will merge into the development branch when code is tested and done
Repository Software
We currently have 6 repositories in git and 4 in mercurial (see below, as of 7/13/2015).
As there is some value in consistency, all new repositories will be in git.
Converting the mercurial repositories to git is not a priority.
git
- yt_webapp
- ythub_workers
- nds-wiki
- nds-dashboard
- nds-django
- nds-docker-django
mercurial
- nds-labs
- nds-webservice
- nds-explorer
- ndslabs-gateway