Differences

This shows you the differences between two versions of the page.

--- content:servalmesh:git_master_branch [26/08/2013 22:39]
Andrew Bettison more information
+++ content:servalmesh:git_master_branch [27/08/2013 00:57] (current)
Andrew Bettison [Rules for committing]
@@ Line 23: / Line 23: @@
 ==== Rules for committing ====
-Source code on the master branch is never edited and committed directly, unlike on the [[Git development branch]].  The head of the master branch only advances in the following ways:
+Source code on the master branch is never edited and committed directly (unlike the [[Git development branch]]).
-  * Merging in a release branch at the [[.:release:Finish the release process|conclusion]] of a [[.:release:]].  This must be done using the ''<nowiki>--no-ff</nowiki>'' option to avoid a [[http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging|fast-forward merge]], to ensure that there is a distinct commit for every version, since release tags (see below) cannot share the same commit.
+The head of the master branch can only be advanced by [[:content:dev:Senior Developer|senior developers]]:
+  * Merging in a release branch at the [[.:release:Finish the release process|conclusion]] of a [[.:release:]].  This must be done using the **''<nowiki>--no-ff</nowiki>''** option to avoid a [[http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging|fast-forward merge]], to ensure that there is a distinct commit for every version, since release tags (see below) cannot share the same commit.
 ==== Release tags ====

The Serval Project Wiki

User Tools

Site Tools

Differences

Page Tools