Q&A

When do we merge to development branch? Once started, US development should be based in feature branches off of the development branch. PRs should be reviewed and approved by the appropriate team members. This happens before the end of the allocated sprint.

When do we merge to IN branch? The responsibility of merging to IN falls upon engineering leads. Once a confirmation from the Engineering Manager is given, this merging will happen. Sprint specific work is merged into IN often via cherry-picking.

When do we cut release branch? After signoff on Meso (which reflects what is currently in IN). When and how does development and IN align? Engineering leads will align on the last day of the sprint, regardless of open items.

What is the flow for Hotfix of a version currently in Capax if it is QA testable? Developer will code hotfix against the necessary release branch. Once reviewed and merged, it should be corrected in other applicable releases and development branch. Work with SRE team and Engineering Manager for deployment and testing of hotfix on the way to production.

What is the flow for a Hotfix of a version NO LONGER in Capax if it is QA testable? **QA cannot test versions no longer in Capax, but same process applies: Developer will code hotfix against the necessary release branch. Once reviewed and merged, it should be corrected in other applicable releases and development branch. Work with SRE team and Engineering Manager for deployment and testing of hotfix on the way to production. Standards for handling when no changes to a repo but we want the version to increment (for clarity of future deployments). Engineering leads can do a fake commit to increment the versions. To Do: Work to unify branching strategies between both sprint pods.