Changes between Version 23 and Version 24 of DRM4G/Development

Timestamp:

Feb 16, 2017 2:21:34 PM (5 years ago)

Author:

minondoa

Comment:

--

DRM4G/Development

@@ -317 +317 @@
 }}}
 
-When finished, the branch __has to be merged back into the '''develop''' branch__. After it can be deleted.
+When finished, the branch __has to be [=#mergeIntoDevelop merged back into the '''develop''' branch__]. After it can be deleted.
 * 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'''".
 
@@ -342 +342 @@
 }}}
 
+
+
+[[br]]
+=== Updating a branch ===
+Sometimes you'll want to __incorporate the changes or improvements__ made in __one branch into another one__. To avoid making the log history too complicated when merging the '''feature branch''' back into the '''develop''' branch, the merges will be fast forwarded.
+{{{#!sh
+git checkout branch_a
+git merge branch_b
+}}}
 
 
@@ -359 +368 @@
 * 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. 
 
-When ready, all that needs to be done is merge it into the '''master''', create a tag, update the remote repositories and [wiki:DRM4G/Development#Publishingarelease publish the new release].
+When ready, all that needs to be done is [=#mergeIntoMaster merge it into the '''master'''], create a tag, update the remote repositories and [wiki:DRM4G/Development#Publishingarelease publish the new release].
 
 {{{#!sh
@@ -391 +400 @@
 === 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:
+ * If you get a merge conflict when for example [#mergeIntoMaster 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