Developer Infos

From Netatalk Wiki
Jump to: navigation, search
Line 10: Line 10:
  
 
The examples in the following sections are based off of the tools and syntax used by git v1.5.3 or later.  Either apt-get, yum, or make install the tools.  See [http://www.kernel.org/pub/software/scm/git/ Git documentation] for more details on this part.
 
The examples in the following sections are based off of the tools and syntax used by git v1.5.3 or later.  Either apt-get, yum, or make install the tools.  See [http://www.kernel.org/pub/software/scm/git/ Git documentation] for more details on this part.
 
 
Note that under Debian or Ubuntu, git is distributed in the git-core package.  The git package contains the "GNU Interactive Tools".  
 
Note that under Debian or Ubuntu, git is distributed in the git-core package.  The git package contains the "GNU Interactive Tools".  
  
 +
== Main Netatalk Branches ==
 +
 +
Development now uses a branching workflow adopted from [http://nvie.com/posts/a-successful-git-branching-model/ A successful Git branching model].
 +
* the "master" branch is for creating releases of the current release series (currently Netatalk 3.x, 28.3.2012), never commit changes on this branch(!)
 +
* the "develop" branch is where development on 3.x is happening
 +
* feature branches can be used to develop new features for the upcoming or a distant future release. The essence of a feature branch is that it exists as long as the feature is in development, but will eventually be merged back into "develop". Feature branches often exist in developer repos only, but may be pushed to the central git repo for collaboration
 +
* in addition to [http://nvie.com/posts/a-successful-git-branching-model/ A successful Git branching model] we use branches named "product-x.y" for older versions still in stable maintenance mode (currently "product-2-2" for Netatalk 2.2.z)
  
 
== Basic Netatalk Git ==
 
== Basic Netatalk Git ==

Revision as of 12:20, 28 March 2012

Personal tools
Namespaces
Variants
Actions
Navigation
Toolbox