Changes between Version 22 and Version 23 of DRM4G/Development

Timestamp:

Feb 9, 2017 9:06:43 PM (5 years ago)

Author:

minondoa

Comment:

--

DRM4G/Development

@@ -301 +301 @@
 }}}
 
+
+[[br]]
 === Adding new features ===
 
@@ -339 +341 @@
 Should it be explained how the rebase works?
 }}}
+
+
 
 [[br]]
@@ -352 +356 @@
 * __For creating '''tags'''__, the same naming convention will be followed, albeit just the digits will be used.
 
-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.
+__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.
 * 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. 
 
@@ -384 +388 @@
 
 
+[[br]]
+=== Problems merging branches ===
+When performing a merge, there may be some complications.
+ * 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:
+
+{{{#!sh
+git checkout master
+git merge --squash drm4g-X.X.X
+#conflict occurred
+git merge --abort #or in case you commited without realizing it "git reset --hard HEAD~1" to go back to the previous commit
+#"git reset --hard HEAD" if the "--abort" commands gives you this message "fatal: There is no merge to abort (MERGE_HEAD missing)."
+git merge --squash -Xtheirs drm4g-X.X.X
+git commit -v
+}}}
+* 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.
+
+[[br]]
 === Hotfixes ===