Branching StrategyBranching Strategy

Main Branch

Development Branch

Main Release Branch

Release Branch 1.0.0

Release Branch 1.1.0

Release Branch 2.0.0

Development BranchDevelopment Branch

Scrum ProcessScrum Process

Main Branch

Strat of Sprint

End of Sprint

Main Release Branch

Release Branch 1.1.0

1

2

3 43 3

2 2

5

8

9

7

New Sprint

10

1

2

3

4

Merge everything form Main to Development Branch

Developing Process

Merging accepted User Stories to Main Branch

Merge all accepted user stories to Main Branch

5

6

7

8

Merge Latest Version

Publish Main Release Branch to Production

Create a new specific release branch

There is a Bug on Production? Fix it on the relevant branch And Merge back to the Main Release Branch. It is a Hot Fix.

6

9 Merge back Hot Fixes to the Main Branch.

10 At the beginning of the next sprint all changes will apply to Development BranchOr some selected user stories

Thank you for your attentionThank you for your attention

Produced by: Hedayat AbedijooProduced by: Hedayat Abedijoo