Changes between Version 7 and Version 8 of DRM4G/Development


Ignore:
Timestamp:
Dec 7, 2016 3:47:08 PM (5 years ago)
Author:
minondoa
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • DRM4G/Development

    v7 v8  
    142142
    143143When finished, the branch __has to be merged back into the '''develop''' branch__. After it can be deleted.
    144 * To keep the history of the branches created, the merges to the '''develop''' branch, will always be done with the no fast-forward option "'''--no-ff'''".
     144* To keep the log history of the branches created, the merges to the '''develop''' branch, will always be done with the no fast-forward option "'''--no-ff'''".
    145145
    146146{{{#!comment
     
    156156}}}
    157157
    158 
    159 
    160 
     158To make the log more readable, in the cases in which a lot of small commits were made in the '''feature branch''', it may be advisable to ''rebase'' to merge some commits before doing the merge into '''develop''':
     159
     160{{{#!sh
     161git rebase -i <hash_code>
     162}}}
     163
     164{{{#!comment
     165Should it be explained how the rebase works?
     166}}}
     167
     168[[br]]
    161169=== Getting ready for a release ===
    162170