Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset 8 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 739

Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset 8 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 739

Warning: preg_match_all(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 717

Warning: Invalid argument supplied for foreach() in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 718

Warning: preg_replace(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 722

Warning: preg_match_all(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 717

Warning: Invalid argument supplied for foreach() in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 718

Warning: preg_replace(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 722

Warning: preg_match_all(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 717

Warning: Invalid argument supplied for foreach() in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 718

Warning: preg_replace(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 722

Warning: preg_match_all(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 717

Warning: Invalid argument supplied for foreach() in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 718

Warning: preg_replace(): Compilation failed: group name must start with a non-digit at offset 4 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 722

Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset 8 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 739

Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset 8 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 739

Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset 8 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 739

Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset 8 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 739
Developer Infos - Netatalk Wiki

Developer Infos


Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset 8 in /home/project-web/netatalk/htdocs/wiki/includes/MagicWord.php on line 739
From Netatalk Wiki
Jump to: navigation, search
(Main Netatalk Branches)
(Main Netatalk Branches)
Line 23: Line 23:
 
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 ==
+
== Branching model ==
  
 
* the "master" branch is where development on new features is taking place
 
* the "master" branch is where development on new features is taking place
 
* branches named "branch-netatalk-x.y" for stable releases
 
* branches named "branch-netatalk-x.y" for stable releases
 
* currently stable release branch ''branch-netatalk-3-1''
 
* currently stable release branch ''branch-netatalk-3-1''
 +
* commits go to master (after a review, more on that below) 
 +
* commits can only go into a release branch if a bugreport exists
 +
* the bugreport must be referenced in the commit message
 +
* no branch merges
  
 
== Basic Netatalk Git ==
 
== Basic Netatalk Git ==

Revision as of 13:38, 18 June 2016

Personal tools
Namespaces
Variants
Actions
Navigation
Toolbox