Changes between Version 6 and Version 7 of WorkingGuideLines
- Timestamp:
- 06/10/09 12:32:13 (16 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
WorkingGuideLines
v6 v7 36 36 * The owner of the ticket will now merge the fix (located in the XXY_<something_descriptive_here> branch) into the parent branch. For this he eventually has to rebase this branch on the parent one. If the fix was a bugfix, then the fix would be now in the mc-X.Y branch. 37 37 * In this case the fix is still missing in the master branch. Please never!!!! rebase the stable release branch mc-X.Y in order to get a fix merged. If the merge failed because of conflicts fix them manually. 38 * Now you can simply close the ticket and the ticket will change into the testing state. 38 * Now you can simply close the ticket and the ticket will change into the testing state. In ticket you must describe how get summary path . for example: 39 {{{ 40 git-diff 111111111111111^...222222222222222 41 }}} 42 where 111111111111111 - first commit; 222222222222222 - last commit 39 43 * After some time of testing a ticketadmin will close it finally. 40 44