Changes between Version 7 and Version 8 of DRM4G/Development

Timestamp:

Dec 7, 2016 3:47:08 PM (5 years ago)

Author:

minondoa

Comment:

--

DRM4G/Development

@@ -142 +142 @@
 
 When finished, the branch __has to be merged back into the '''develop''' branch__. After it can be deleted.
-* 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'''".
+* 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'''".
 
 {{{#!comment
@@ -156 +156 @@
 }}}
 
-
-
-
+To 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''':
+
+{{{#!sh
+git rebase -i <hash_code>
+}}}
+
+{{{#!comment
+Should it be explained how the rebase works?
+}}}
+
+[[br]]
 === Getting ready for a release ===