r/git

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

TryHyraxNow is a code quality tool for repos shipping code faster than anyone can review it. Two halves: it reviews every new PR, and it audits the code you already have.

For new code, connect a repo and the reviews will start automatically, nothing to configure. It will review your change against the whole repository: the definitions of every type the diff references, the sibling files that do the same job, your dependencies and migration state. That's what catches "you changed 2 of the 4 places that do this" type of bug.

• No more than 7 findings at a time, so you can focus on the big items first. Every finding has to ground its premise and cite the exact lines it's talking about, then survive an internal pass that argues against it, before we post it to you.

For existing code, our full audit runs ~39 tools in six categories: Security, Correctness, Maintainability, Performance, Architecture, Operations. Findings are scored by severity and effort, so easy wins surface first.

• Click "Fix", get a PR. our tool writes the change, runs your repo's own tests and build, reviews its own diff, then opens the pull request as a draft — and flips it to ready once your CI goes green, third-party checks included. If CI fails, our tool reads the failure and pushes another attempt. By default nothing will merge without your approval.

Your coding agents get all the context we generate, too. TryHyraxNow will profile your repository to discover architecture, conventions, how-to guides, and serve it over MCP. Same thing we use internally.

We've got a free plan with no credit card needed. $30 credit at signup that never expires, and $10/month of credit. Full catalog, unlimited repos and teammates, MCP, everything included. Paid is $30/seat and the whole amount comes back as credit.

Users outside USA need to use a vpn to access the website. 
TryHyraxNow.com

What's the last false positive a review bot cost you an hour on? Open to any suggestions on what we can do to serve you all better and reach more new customers.