How to Prevent and Resolve Git Merge Conflicts in SQL Migrations

Quick answer

Git merge conflicts in SQL migrations occur when multiple developers concurrently create migration files with the same sequential version number (e.g. V004__add_users.sql). Prevent collisions by using UTC timestamp versioning (e.g., 20261013143000_name.sql), enforcing rebase checks in CI, and configuring migration runners (like Flyway, Liquibase, or Drizzle) to accept out-of-order execution in non-production environments.