Our branching strategy is going to be GitFlow with some modifications to accommodate demo and testing.
Note we will be renaming
dev
tomaster
by Monday (1/21)
We are trying to solve these current challenges which we will likely not have in the future as our testing and dev ops improve
- Allow stability in the demo branches while working with small timezone overlaps. By the time the offshore team is done for the day the US team is just getting started and so we need to have a way that we can get demo stable the day before Friday demos but continue work on Fridays.
- Where can code be tested?
- The frequency of demos being weekly is causing us to to have to demo code that hasn't been fully reviewed and merged.