Changes between Version 22 and Version 23 of DRM4G/Development
- Timestamp:
- Feb 9, 2017 9:06:43 PM (5 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
DRM4G/Development
v22 v23 301 301 }}} 302 302 303 304 [[br]] 303 305 === Adding new features === 304 306 … … 339 341 Should it be explained how the rebase works? 340 342 }}} 343 344 341 345 342 346 [[br]] … … 352 356 * __For creating '''tags'''__, the same naming convention will be followed, albeit just the digits will be used. 353 357 354 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.358 __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. 355 359 * 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. 356 360 … … 384 388 385 389 390 [[br]] 391 === Problems merging branches === 392 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: 394 395 {{{#!sh 396 git checkout master 397 git merge --squash drm4g-X.X.X 398 #conflict occurred 399 git merge --abort #or in case you commited without realizing it "git reset --hard HEAD~1" to go back to the previous commit 400 #"git reset --hard HEAD" if the "--abort" commands gives you this message "fatal: There is no merge to abort (MERGE_HEAD missing)." 401 git merge --squash -Xtheirs drm4g-X.X.X 402 git commit -v 403 }}} 404 * 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. 405 406 [[br]] 386 407 === Hotfixes === 387 408