Cytoscape Wiki|
← Revision 6 as of 2013-02-06 01:57:56
Size: 1389
Comment:
|
← Revision 7 as of 2013-02-06 02:15:12 →
Size: 2194
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 12: | Line 12: |
| We use the following to manage branches. | |
| Line 14: | Line 13: |
| The following two branches always exist for all sub-projects. |
{{http://nvie.com/img/2009/12/Screen-shot-2009-12-24-at-11.32.03.png}} ~- (This image was created by [[http://nvie.com/posts/a-successful-git-branching-model/|Vincent Driessen]]) -~ === Branching Model for Cytoscape Core Projects === Cytoscape Core projects use the following branching model: * [[http://nvie.com/posts/a-successful-git-branching-model/|A successful Git branching model]] This is one of the best practices used in developers community using git. The following two branches always exist for all sub-projects: |
| Line 16: | Line 25: |
|
* '''''master''''' - for tagging releases. Will not be used for daily development. * '''''develop''''' - for development. This branch was called ''trunk'' in our old SVN repository. |
* '''''master''''' - for tagging releases. Once we create a release, the code set will be set to HEAD of this branch. This will '''NOT''' be used for daily development. * '''''develop''''' - for development. This branch was called ''trunk'' in our old SVN repository. Core developers commit their code to this branch. |
| Line 19: | Line 28: |
| And in addition to these branches, we maintain the following: | In addition to these branches, we use the following branches: |
| Line 21: | Line 30: |
|
* Hotfix For more information about this branching strategy, please read the following document: * [[http://nvie.com/posts/a-successful-git-branching-model/|A successful Git branching model]] |
* hotfix - for bug fix releases. For example, fixes for 3.0.1 release will be maintained in this branch and will be merged back to both ''develop'' and ''master''. * release - once we reach to a milestone, we create this branch for the next release. For example, 3.1.0 code will be maintained in this branch and will be merged back to ''develop''. Once it is ready to release, it will be merged back to master and tagged. |
Cytoscpae Projects at Github
Introduction
Cytoscape Core projects are now hosted at GitHub. To work on the core, you need to learn how to use git. Please read some books/documents about git and understand basic concepts of distributed source code management system.
Clone Cytoscape 3 Core Projects with repo
Please read README.md file for the latest information.
Working with Branches
(This image was created by Vincent Driessen)
Branching Model for Cytoscape Core Projects
Cytoscape Core projects use the following branching model:
This is one of the best practices used in developers community using git. The following two branches always exist for all sub-projects:
master - for tagging releases. Once we create a release, the code set will be set to HEAD of this branch. This will NOT be used for daily development.
develop - for development. This branch was called trunk in our old SVN repository. Core developers commit their code to this branch.
In addition to these branches, we use the following branches:
hotfix - for bug fix releases. For example, fixes for 3.0.1 release will be maintained in this branch and will be merged back to both develop and master.
release - once we reach to a milestone, we create this branch for the next release. For example, 3.1.0 code will be maintained in this branch and will be merged back to develop. Once it is ready to release, it will be merged back to master and tagged.
Let's start Social coding!
Questions?
Cytoscape mailing lists are the best place to ask questions.