I got a question last week about conflict resolution. The user had read Programmatic Data Conflict Resolution and Three-Way Merge in a SQL Database and was left wanting more. Both posts use the same line: Resolving conflicts is up to the user. The user wanted to know what users actually do. This article is my answer. What Is a Conflict? # A data conflict happens when Dolt’s three-way merge can’t…