Salesforce Git branching Approach

This is one workflow that might work for sfdx and git, main priority is to allow for development in scratch org, to deply for testing into a UAT sandbox and then deploy into production.

Starting point: master branch with source code and linked to scratch org.

Task: New feature to be developed

Approach:

1. Master has the main details of the package
2. Create new branch called develop (pull requests/commits into develop will deply package to UAT)
3. Create new branch from develop called feature (commits to feature will deploy a scratch org)
4. After successful coding
5. Pull request feature into develop (so package installed in UAT)
6. Test in UAT
7. Pull request develop into master (so package deployed in production)