Currently, we are in a process of restructuring our branching. The main requirement is that, features should be tested in isolation and can be released one by one.

We have 2 branches, develop and main, and 3 deployment environments. DEV, STAGE and PROD.

We do feature branches out of DEV and do peer QA on these branches. Once the code is merged to develop we do a QA on the features merged on DEV env. And then to STAGE and to PROD.

But for us its really hard to release the features one by one. For now we are planning to block merge to develop until we merge the develop to main.

Any better strategy we can follow?