How are you handling Git branching for database migrations?

We're validating our approach for database GitOps and noticing that traditional branching-per-environment models often introduce significant friction:

1. Merge conflicts across dev, qa, prod branches 2. Inconsistent baselines and forgotten hotfixes 3. Broken audit trails and configuration drift

We shifted instead to a trunk-based approach with Liquibase contexts:

1. All changes stored in one main branch 2. Environment-specific behavior driven by context metadata 3. Promotions handled via pipelines, not merges 4. Full GitOps traceability and one-click rollback support