corinthia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject svn commit: r1649763 - /incubator/corinthia/www/policy_git.html
Date Tue, 06 Jan 2015 09:44:02 GMT
Author: jani
Date: Tue Jan  6 09:44:02 2015
New Revision: 1649763

added first version of Git policy.


Modified: incubator/corinthia/www/policy_git.html
--- incubator/corinthia/www/policy_git.html (original)
+++ incubator/corinthia/www/policy_git.html Tue Jan  6 09:44:02 2015
@@ -50,7 +50,18 @@
 	  <div class="large-12 columns">
   	  <div class="float left"><img src="img/owl.jpg" width="250" height="250" alt=""
title="" /></div>	  	  
 	  	   	<h3>Use of Git</h3>
-	  		<p>history</p>
+	  		<p>We aim not to make long and complicated rules for using Git, but we (and apache)
want to have transparency, so a few rules is needed</p>
+			<h4>History</h4>
+			<p>Do not rewrite history on our branches, we want to have a liniar history without
+			<h4>Branches</h4>
+			<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>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>
 <!-- footer section -->

View raw message