Changes between Version 22 and Version 23 of DRM4G/Development


Ignore:
Timestamp:
Feb 9, 2017 9:06:43 PM (5 years ago)
Author:
minondoa
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DRM4G/Development

    v22 v23  
    301301}}}
    302302
     303
     304[[br]]
    303305=== Adding new features ===
    304306
     
    339341Should it be explained how the rebase works?
    340342}}}
     343
     344
    341345
    342346[[br]]
     
    352356* __For creating '''tags'''__, the same naming convention will be followed, albeit just the digits will be used.
    353357
    354 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.
     358__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.
    355359* During this process you might want to merge the new version number or some of the bug fixes on to the '''develop''' branch so that future features may incorporate them.
    356360
     
    384388
    385389
     390[[br]]
     391=== Problems merging branches ===
     392When performing a merge, there may be some complications.
     393 * If you get a merge conflict when for example merging a release branch ('''drm4g-X.X.X''') into '''master''', which would make you lose the whole automatically generated squash commit message since you'd have to resolve conflicts and commit on your own, do this:
     394
     395{{{#!sh
     396git checkout master
     397git merge --squash drm4g-X.X.X
     398#conflict occurred
     399git merge --abort #or in case you commited without realizing it "git reset --hard HEAD~1" to go back to the previous commit
     400#"git reset --hard HEAD" if the "--abort" commands gives you this message "fatal: There is no merge to abort (MERGE_HEAD missing)."
     401git merge --squash -Xtheirs drm4g-X.X.X
     402git commit -v
     403}}}
     404* This will choose all of the changes made in the branch over the ones in the '''master''' branch, so only use this if you're completely sure of what you're doing.
     405
     406[[br]]
    386407=== Hotfixes ===
    387408