Changes between Version 16 and Version 17 of GitCreateBundle
- Timestamp:
- Oct 25, 2013, 9:53:35 AM (11 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
GitCreateBundle
v16 v17 37 37 Each patch must be associated to a ticket (see [StandardsAndGuideLines guidelines]), hence a git bundle should '''only perform the merge''' of two branches: no new "patches" should be stacked in, in none of the two branches (number of refs in the bundle will be checked anyway by the patch manager); 38 38 * NAMING CONVENTIONS 39 * the name of the merging '''commit''' must follow the naming convention "` Merge branch 'feature_X' into master`", so actually leave the default title that git sets;39 * the name of the merging '''commit''' must follow the naming convention "`ticket:NNN - Merge branch 'feature_X' into master`", so actually leave the default title that git sets; 40 40 * the name of the '''bundle file''' must follow the pattern "`ticket:NNN_descriptionOfMerge.bundle`", referring to the ticket which justifies the merge. 41 41