Changes between Version 8 and Version 9 of DRM4G/Development

Timestamp:

Dec 7, 2016 4:24:29 PM (5 years ago)

Author:

minondoa

Comment:

--

DRM4G/Development

@@ -145 +145 @@
 
 {{{#!comment
-Before merging, maybe it would be advisable to merge the '''develop''' branch into the '''feature branch''', to verify that all the changes work well, at least in the case where further changes have been done to the '''develop''' since the '''feature branch''' was created. Then if everything goes well merge the '''feature branch''' into the '''develop''' branch.
+Before merging, maybe it would be advisable to merge the '''develop''' branch into the '''feature branch''', to resolve any possible conflicts and to verify that all the changes work properly, at least in the case where further changes have been done to the '''develop''' since the '''feature branch''' was created. Then if everything goes well merge the '''feature branch''' into the '''develop''' branch.
 }}}