Changes between Version 17 and Version 18 of DRM4G/Development


Ignore:
Timestamp:
Dec 12, 2016 8:09:51 PM (6 years ago)
Author:
minondoa
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DRM4G/Development

    v17 v18  
    333333The '''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.
    334334
    335 * As for the naming convention for these branches, they can be anything separated by hyphens ("'''-'''"), but always adding the prefix "'''drm4g-'''".
     335* As for the naming convention for these branches, they can be anything separated by underscores ("'''_'''").
    336336 * However the name should try to be describe what is being implemented with it.
    337337
    338338{{{#!sh
    339339git checkout develop
    340 git checkout -b drm4g-new-feature #it will switch you to the new branch
     340git checkout -b new_feature #it will switch you to the new branch
    341341}}}
    342342
     
    350350{{{#!sh
    351351git checkout develop
    352 git merge --no-ff drm4g-new-feature
    353 git branch -d drm4g-new-feature
     352git merge --no-ff new_feature
     353git branch -d new_feature
    354354git push origin develop
    355355git push github develop