You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by ja...@apache.org on 2015/01/06 10:46:08 UTC
svn commit: r1649764 - /incubator/corinthia/www/policy_git.html
Author: jani
Date: Tue Jan 6 09:46:08 2015
New Revision: 1649764
URL: http://svn.apache.org/r1649764
Log:
one more time
Modified:
incubator/corinthia/www/policy_git.html
Modified: incubator/corinthia/www/policy_git.html
URL: http://svn.apache.org/viewvc/incubator/corinthia/www/policy_git.html?rev=1649764&r1=1649763&r2=1649764&view=diff
==============================================================================
--- incubator/corinthia/www/policy_git.html (original)
+++ incubator/corinthia/www/policy_git.html Tue Jan 6 09:46:08 2015
@@ -57,7 +57,7 @@
<p>We use 2 branches constantly:</p>
<ul><li><b>master</b> This is our development branch, commit code to this branch whenever you have finished developing and testing a feature. Every commit on this branch, must be verified and tested on the platform the committer uses, do NOT commit non working versions here.</li>
<li><b>stable</b> This is our release branch, whenever HEAD on <b>master</b> is tested on all platforms the content is merged to <b>stable</b>, therefore <b>stable</b> is a timeline where corinthia worked on all supported platforms. do NOT commit to <b>stable</b> without previous agrement on dev@</li></ul>
- <p>If you make changes to any API or work on a bigger feature make an "experimentXYZ" remote branch, in order for other developers to view your code before committing it to <b>stable</b></p>
+ <p>If you make changes to any API or work on a bigger feature make an "experimentXYZ" remote branch, in order for other developers to view your code before committing it to <b>master</b></p>
<p>Use a local work branch while you develop, once you have finalized and tested the feature/bug fix, merge it with --squash to <b>master</b></p>
<h4>Workflows (examples)</h4>
<p>Please see Git FAQ</p>