Boutique product development companyIt is amazing what you can accomplish when you have a client-centric team to deliver o...
Branching Over the Top    Sohail Mohabbat Ali | Software Evangelist
Branching Over the TopTopics covered in the presentation     •   What is branch merging     •   Why Branching     •   When...
BranchingBranching and MergingBranching is the duplication of an object under revision control so that   modifications can...
BranchingWhy Branching•   Makes Software Agile•   Increases Maintainability.                                 Sohail Mohabb...
BranchingWhen Branching?•   Release Isolation•   Feature Isolation•   Team Isolation•   Integration Isolation             ...
BranchingBranching Plans • Basic Branch Plan • Standard Branch Plan • Advanced Branch Plan                          Sohail...
BranchingBasic Branch Plan • Basic Branch Plan • Standard Branch Plan • Advanced Branch Plan                          Soha...
BranchingBranching Plans                                                                         Development             B...
BranchingAdvance Branch Plans                                                                                  Development...
BranchingBranch Example (Single Team)                                                                                     ...
BranchingBranch Example (Multi Team)               DEV FT3                                  V1.1 FT2 (start)              ...
Branching    Branch Example (Feature)                                                                                     ...
BranchingBranch Example (Hotfix, Servicepack)   The two DEV          DEV …        2   branches are    created as sequentia...
Upcoming SlideShare
Loading in...5
×

Ts branching over the top

164

Published on

0 Comments
0 Likes
Statistics
Notes
  • Be the first to comment

  • Be the first to like this

No Downloads
Views
Total Views
164
On Slideshare
0
From Embeds
0
Number of Embeds
5
Actions
Shares
0
Downloads
2
Comments
0
Likes
0
Embeds 0
No embeds

No notes for slide

Ts branching over the top

  1. 1. Boutique product development companyIt is amazing what you can accomplish when you have a client-centric team to deliver outstanding products.
  2. 2. Branching Over the Top Sohail Mohabbat Ali | Software Evangelist
  3. 3. Branching Over the TopTopics covered in the presentation • What is branch merging • Why Branching • When Branching • Branch Plans • Branch Examples • Demo Sohail Mohabbat Ali | Software Evangelist
  4. 4. BranchingBranching and MergingBranching is the duplication of an object under revision control so that modifications can happen in parallel along both branches.Merging is the act of reconciling multiple changes made to different copies of the same file. Most often, it is necessary when a file is modified by two people on two different computers at the same time. Later, these changes are merged, resulting in a single new file that contains both sets of changes. Sohail Mohabbat Ali | Software Evangelist
  5. 5. BranchingWhy Branching• Makes Software Agile• Increases Maintainability. Sohail Mohabbat Ali | Software Evangelist
  6. 6. BranchingWhen Branching?• Release Isolation• Feature Isolation• Team Isolation• Integration Isolation Sohail Mohabbat Ali | Software Evangelist
  7. 7. BranchingBranching Plans • Basic Branch Plan • Standard Branch Plan • Advanced Branch Plan Sohail Mohabbat Ali | Software Evangelist
  8. 8. BranchingBasic Branch Plan • Basic Branch Plan • Standard Branch Plan • Advanced Branch Plan Sohail Mohabbat Ali | Software Evangelist
  9. 9. BranchingBranching Plans Development Branch Branch SERVICE PACK Production / Release Branch RELEASE Sohail Mohabbat Ali | Software Evangelist
  10. 10. BranchingAdvance Branch Plans Development Branch Branch SERVICE PACK Branch Production / Release HOT FIX Branch RELEASE Sohail Mohabbat Ali | Software Evangelist
  11. 11. BranchingBranch Example (Single Team) Nightly Build (Early Validation) CI / Nightly Builds (Early validation) V1.1 (start) V1.1 FT3 V1.2 DEV 3 4 5 8 Branch RI RI FI FI FI V1.1 V1.2 1 2 6 7 V1.0 V1.1 (bug fix) Production Sohail Mohabbat Ali | Software Evangelist
  12. 12. BranchingBranch Example (Multi Team) DEV FT3 V1.1 FT2 (start) V1.1 FT2 RI DEV FT2 BM V1.1 FT1 RI DEV FT1 FI Branch Branch Branch RI V1.1 FT1 V1.1 GoldenMAIN V1.0 Branch RI FI V1.0.1 V1.1 (Release) PRODUCTION Sohail Mohabbat Ali | Software Evangelist
  13. 13. Branching Branch Example (Feature) The Reverse The two DEV FEATURE 2 4 Integration tasks branches are are sequential created as tasks, but Branchsequential tasks, created as two RIbut as one unit of units of work work. TEAM 2 2 5 FEATURE 1 3 Branch RI TEAM 1 2 5 Branch RI MAIN 1 6 6 Branch Sohail Mohabbat Ali | Software Evangelist
  14. 14. BranchingBranch Example (Hotfix, Servicepack) The two DEV DEV … 2 branches are created as sequential tasks, but as one unit of work. DEV-1 2 Branch MAIN 1 Branch Branch FI R1 (SP) R2 (SP) SERVICE PACK 3 6 Branch Branch Branch R1 (SP0) R1 (SP1) R2 (SP0) HOT FIX 4 7 Branch Branch Branch R1 (SP0) R1 (SP1) R2 (SP0) Sohail Mohabbat Ali | Software Evangelist
  1. A particular slide catching your eye?

    Clipping is a handy way to collect important slides you want to go back to later.

×