2Mundos Git Workflow

1. Create Feature Branch from Master Branch (Stable Version)

2. Complete Work on Feature Branch

3. Merge Feature Branch into Develop Branch

4. Resolve Conflicts and Test Feature in Sandbox Environment

5. Merge Feature Branch into Stage Branch

6. Create QA Feature Branch from Stage Branch

7. Once Feature Branch is QA Tested, Merge QA Feature Branch into Sprint Release Branch

8. At the end of the Sprint: Merge Sprint Release Branch into Master Branch