Git Workflow for Salesforce Projects: Branching, SFDX, and CI

# 1. Pull latest from staging
git checkout staging
git pull origin staging
 
# 2. Create feature branch
git checkout -b feature/TICKET-123-account-validation
 
# 3. Create scratch org for isolated development
sf org create scratch \
  --definition-file config/project-scratch-def.json \
  --alias ticket-123 \
  --duration-days 7
 
# 4. Push source to scratch org
sf project deploy start --target-org ticket-123
 
# 5. Develop in the scratch org...
# 6. Retrieve changes back to local
sf project retrieve start \
  --metadata ApexClass:AccountValidator \
  --target-org ticket-123
 
# 7. Commit and push
git add force-app/main/default/classes/AccountValidator*
git commit -m "feat(TICKET-123): add account validation on before insert"
git push origin feature/TICKET-123-account-validation
 
# 8. Open PR targeting staging

# .github/workflows/validate-pr.yml
name: Validate PR
on:
  pull_request:
    branches: [staging]
 
jobs:
  validate:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
 
      - name: Install Salesforce CLI
        run: npm install -g @salesforce/cli
 
      - name: Authenticate Dev Hub
        run: |
          echo "${{ secrets.SF_DEVHUB_AUTH_URL }}" > devhub.txt
          sf org login sfdx-url --sfdx-url-file devhub.txt --alias devhub --set-default-dev-hub
 
      - name: Create Scratch Org
        run: |
          sf org create scratch \
            --definition-file config/project-scratch-def.json \
            --alias ci-org \
            --duration-days 1 \
            --target-dev-hub devhub
 
      - name: Deploy and Run Tests
        run: |
          sf project deploy start \
            --source-dir force-app \
            --target-org ci-org \
            --test-level RunLocalTests \
            --wait 30
 
      - name: Delete Scratch Org
        if: always()
        run: sf org delete scratch --target-org ci-org --no-prompt

# 1. Merge staging → main after UAT sign-off
git checkout main
git merge staging --no-ff -m "chore: merge UAT release 2026.05.01"
 
# 2. Tag the release
git tag -a v2026.05.01 -m "Release 2026.05.01"
git push origin main --tags
 
# 3. GitHub Actions auto-deploys main to production

# .github/workflows/deploy-prod.yml
name: Deploy to Production
on:
  push:
    branches: [main]
 
jobs:
  deploy:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v4
      - name: Install CLI
        run: npm install -g @salesforce/cli
      - name: Authenticate Production
        run: |
          echo "${{ secrets.SF_PROD_AUTH_URL }}" > prod.txt
          sf org login sfdx-url --sfdx-url-file prod.txt --alias prod
      - name: Deploy
        run: |
          sf project deploy start \
            --source-dir force-app \
            --target-org prod \
            --test-level RunLocalTests \
            --wait 60