Changes between Version 13 and Version 14 of DRM4G/Development

Timestamp:

Dec 12, 2016 1:14:00 PM (6 years ago)

Author:

minondoa

Comment:

--

DRM4G/Development

@@ -163 +163 @@
 The '''feature branches''' are how new functionalities are introduced and [wiki:DRM4G/Development#TestingtheDRM4G tested]. Normally the finalization of one of them will also define when a new release will be published, but that's not always the case since a new release may include more than one new feature.
 
-* As for the naming convention for these branches, they can be anything separated by hyphens ("'''-'''"), but always adding the prefix "'''DRM4G-'''". 
+* As for the naming convention for these branches, they can be anything separated by hyphens ("'''-'''"), but always adding the prefix "'''drm4g-'''". 
  * However the name should try to be describe what is being implemented with it.
 
 {{{#!sh
 git checkout develop
-git checkout -b DRM4G-new-feature #it will switch you to the new branch
+git checkout -b drm4g-new-feature #it will switch you to the new branch
 }}}
 
@@ -180 +180 @@
 {{{#!sh
 git checkout develop
-git merge --no-ff DRM4G-new-feature
-git branch -d DRM4G-new-feature
+git merge --no-ff drm4g-new-feature
+git branch -d drm4g-new-feature
 git push origin develop
 git push github develop
@@ -202 +202 @@
 
 From this point on, all the following changes done on the '''develop''' branch will be for the following release. So, to avoid halting the development of the project a new '''__release branch__''' is created indicating the new release number.
-* The nomenclature for all '''release branches''' will be a string followed by the new version in numbers in the form of '''__DRM4G-MAJOR.MINOR.PATCH__''' and they will have their numbers increase following these guidelines:
+* The nomenclature for all '''release branches''' will be a string followed by the new version in numbers in the form of '''__drm4g-MAJOR.MINOR.PATCH__''' and they will have their numbers increase following these guidelines:
  *   '''MAJOR''' version when you add some new functionality or you make incompatible API changes
  *   '''MINOR''' version when you improve some part of the DRM4G's functionality in a backwards-compatible manner
  *   '''PATCH''' version when you make backwards-compatible bug fixes.
-* For creating '''tags''', the same naming convention will be followed, albeit just the digits will be used.
+* __For creating '''tags'''__, the same naming convention will be followed, albeit just the digits will be used.
 
 It is in this branch where the version number of all the files will be modified, and where the code will be brought to a release ready state. That means that it is where minor bug fixes will be made, where comments and unnecessary code snippets will be removed and other maintenance tasks will be carried out.
@@ -215 +215 @@
 {{{#!sh
 git checkout master
-git merge --squash DRM4G-X.X.X
+git merge --squash drm4g-X.X.X
 git commit -v
 git tag X.X.X
@@ -230 +230 @@
 {{{#!sh
 git checkout develop
-git merge --no-ff DRM4G-X.X.X
+git merge --no-ff drm4g-X.X.X
 git tag X.X.X
 git push origin develop
@@ -240 +240 @@
 Aferwards you can just delete the '''release branch'''.
 {{{#!sh
-git branch -d DRM4G-X.X.X
+git branch -d drm4g-X.X.X
 }}}