embedaddon/php/README.GIT-RULES - diff

Return to README.GIT-RULES CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php

version 1.1.1.2, 2013/10/14 08:02:08	version 1.1.1.3, 2014/06/15 20:03:41
Line 69 The next few rules are more of a technical nature::	Line 69 The next few rules are more of a technical nature::
branches) an empty merge should be done.	branches) an empty merge should be done.

2. All news updates intended for public viewing, such as new features,	2. All news updates intended for public viewing, such as new features,
bug fixes, improvements, etc., should go into the NEWS file of the	bug fixes, improvements, etc., should go into the NEWS file of *any
first to be released version with the given change. In other words	stable release* version with the given change. In other words,
any NEWS file change only needs to done in one branch.	news about a bug fix which went into PHP-5.4, PHP-5.5 and master
	should be noted in both PHP-5.4/NEWS and PHP-5.5/NEWS but
	not master, which is not a public released version yet.

3. Do not commit multiple file and dump all messages in one commit. If you	3. Do not commit multiple file and dump all messages in one commit. If you
modified several unrelated files, commit each group separately and	modified several unrelated files, commit each group separately and