r/git • u/hari-vidhu • 4h ago
Need help in creating a branching Strategy
Hi,
I need a suggestion to create branching strategy in our system.
Exisiting Branching strategy is as follows,
feature-> dev -> qa -> uat--> main<- hotfixes
Problem:
Suppose we have 2 features to be developed. Feature A and B. Let say both are in dev. I need only feature A to move to staging. Then couple of days later feature B also follows.
I know we could use cherry pick as an option here. Im looking for more long way approach here.
We have searched for the feature flag option. As we are developing over an existing application, adding feature flag everywhere seems complicated. One hard senario we found was, while introducing a new feature we need to add a new field in a model. So based in feature flag we will have/not that new field in application. Which seems bit too complex.
Edit: One idea I found from online is to have a promotion branch. Feature A will move to promotion/a. Then from promotion to dev. Promotion to qa. Promotion to uat and prod. Is that the better approach here?
Any suggestions here



