150 likes | 507 Views
Branching Strategy. Release Branch 1.0.0. Release Branch 1.1.0. Release Branch 2.0.0. Main Release Branch: Ready to Publish on Production. Contain the latest Version of Published functionalities and also Hot Fixes. The bridge between each Release Branch and Main Branch.
E N D
Release Branch 1.0.0 Release Branch 1.1.0 Release Branch 2.0.0 • Main Release Branch: • Ready to Publish on Production. • Contain the latest Version of Published functionalities and also Hot Fixes. • The bridge between each Release Branch and Main Branch. • Ready to receive full or specific functionalities from the Main Branch to publish Main Release Branch Main Branch • Main Branch: • Contain whole functionalities • Without any BUGs • Ready to publish on Production or Test Environment • Ready to demo to customer Development Branch • Development Branch: • Working Environment for Developers • Unreliable Version, may contains Bugs • Ready to Publish on UAT Environment • Release Branch: • Contain a stable version that had been published • First step for implementing Hot Fixes on a proper version • One Release Branch always will be equal to Release Main Branch
Release Branch 1.1.0 Scrum Process 7 8 6 Main Release Branch 5 Main Branch 9 Strat of Sprint New Sprint 3 3 4 3 1 10 End of Sprint 2 2 2 Development Branch Merge everything form Main to Development Branch 1 6 Publish Main Release Branch to Production Developing Process 2 Create a new specific release branch 7 Merging accepted User Stories to Main Branch 3 8 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. Merge all accepted user stories to Main Branch 4 9 Merge back Hot Fixes to the Main Branch. Merge Latest Version 5 10 At the beginning of the next sprint all changes will apply to Development Branch Or some selected user stories
Thank you for your attention Produced by: Hedayat Abedijoo