Merge Conflict

Merge conflicts are a natural consequence of parallel work. When two people branch from the same version and both edit the same paragraph or cell, the system needs human input to decide which change to keep, or whether to combine both changes in a specific way.

In code development, merge conflicts are a well-understood workflow. The developer sees both versions, picks the correct one (or writes a combined version), and marks the conflict as resolved. In game design, merge conflicts are equally valid but most tools do not support them at all. Google Docs simply overwrites one person's changes with the other's, with no notification.

For game design documents, merge conflicts typically arise when two designers edit the same section of a GDD, when two balance designers change the same cells in a spreadsheet, or when a narrative change on one branch conflicts with a different narrative change on another. Explicit conflict detection and resolution is far better than silent overwrites.