Context Navigation

Changes between Version 8 and Version 9 of Chimera2/git

-              v8
+              v9
 We will use '''git''' and '''git flow''' for revision control to manage Chimera 2 source code.  Development will follow the [http://nvie.com/posts/a-successful-git-branching-model/ Vincent Driessen's branching model] where the '''master''' branch is the release branch and the '''develop''' branch is the daily build branch.  A ''team repository'' is the repository that is used to create release and daily builds, ''i.e.'', changes committed in developer repositories but not pushed to the team repository will not appear in either release or daily builds.
+This document is not intended as a '''git''' tutorial or reference.  It has examples for tasks that come up in development of Chimera 2.  For a good introduction, read the '''git''' [http://git-scm.com/book/en/ book].
+There are many web pages describing '''git flow''' in various level of details.  These two are good places to start:
+ - [http://jeffkreeftmeijer.com/2010/why-arent-you-using-git-flow/ Why aren't you using git-flow?]
+ - [http://yakiloo.com/getting-started-git-flow/ Getting Started - Git-Flow]
 The remainder of this document describes some common tasks using '''git'''.  ''plato'' refers to the Linux cluster on which the team repository is stored.  ''franklin'' is the name of a node in the plato cluster.