Changes between Version 23 and Version 24 of DRM4G/Development
- Timestamp:
- Feb 16, 2017 2:21:34 PM (5 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
DRM4G/Development
v23 v24 317 317 }}} 318 318 319 When finished, the branch __has to be merged back into the '''develop''' branch__. After it can be deleted.319 When finished, the branch __has to be [=#mergeIntoDevelop merged back into the '''develop''' branch__]. After it can be deleted. 320 320 * 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'''". 321 321 … … 342 342 }}} 343 343 344 345 346 [[br]] 347 === Updating a branch === 348 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. 349 {{{#!sh 350 git checkout branch_a 351 git merge branch_b 352 }}} 344 353 345 354 … … 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. 360 369 361 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].370 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]. 362 371 363 372 {{{#!sh … … 391 400 === Problems merging branches === 392 401 When performing a merge, there may be some complications. 393 * 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:402 * 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: 394 403 395 404 {{{#!sh