We are creating a new page on our website which will require overall ~5000 LOC. Now the problems here are:
- How to get so many lines reviewed?
- When to merge these changes to master for release?
How we currently solve these problems: We create a temporary Release branch in which everyone will merge their features related to this page. These individual features/pull requests are reviewed by peers. We also keep rebasing this branch with master after every release.
When this temporary Release branch is functionally ready to go live, we merge it in the next release branch which will eventually be merged to master.
- Are we right in maintaining this temporary Release branch merging features in it or is there some better way? On some websites it suggests to merge each small feature of new page to master and take it(keeping it hidden) and in last release you should make these features visible
I have read online but couldn't find the my problem listed elsewhere.
Is it better to merge "often" or only after completion do a big merge of feature branches?