Hey there Marcos,
1- Do most people work in main and only some people that are working directly on the release move to the release branch?
- Yes, most work out of main. We use robomerge to coordinate between our release branches etc.
2- Are you guys still doing new features directly on main? What if you have a feature A and a feature B that are for different releases?
- New features are primarily on main. Longer tail initiatives tend to be feature branches. At a certain point we create a dev-fortnite-RELEASENUMBER branch
3- Is the stream structure a big “line” (not using the word branch here to not confuse with p4 branches. Or do you actually fork out at main releases. With having 8 and 9 on a different stream branch?
- It’s really important to disambiguate how we coordinate changes, vs what the “stream-branch” structure is.
- For a major version, we will indeed have a dev-fortnite-{MAJOR-RELEASE-NUBER} ; with a similar view to 3b
- Our robomerge works a lot more like 3a, insuring that we coordinate changes between the releases.
I hope that clarifies things or you.
Kind regards,
Julian