Differences between revisions 2 and 4 (spanning 2 versions)

Cytoscpae Projects at Github

Clone with repo

We use git-flow to manage branches.

The following two branches always exist for all sub-projects.

master - for tagging releases. Will not be used for daily development.
develop - for development. This branch was called trunk in our old SVN repository.

And in addition to these branches, we maintain the following:

For more information about this branching strategy, please read the following document:

-  ← Revision 2 as of 2012-12-21 21:58:29 →
  Size: 126
  Editor: KeiichiroOno
  Comment:
+  ← Revision 4 as of 2013-01-31 01:56:34 →
  Size: 742
  Editor: KeiichiroOno
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
-= Building Cytoscpae 3 from Github =
+= Cytoscpae Projects at Github =
 Line 3:
+== Clone with repo ==



== Working with Branches ==

We use git-flow to manage branches.



The following two branches always exist for all sub-projects.

 

 * '''''master''''' - for tagging releases.  Will not be used for daily development.

 * '''''develop''''' - for development.  This branch was called ''trunk'' in our old SVN repository.



And in addition to these branches, we maintain the following:



 * 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]]