Now that many teams are using project plans, some are reporting having more merge conflicts than usual. This article is the first in a series that will discuss what causes merge conflicts and how to reduce the number of conflicts a team is having. First, let’s look at what causes merge conflicts.
What Set of Circumstances can Lead to Merge Conflicts?
Understanding what causes merge conflicts is key to preventing them. The Paratext Help describes when merge conflicts occur:
A Send/Receive merge conflict for a project occurs when the project copy being received and the project copy being sent from your computer contain a different change in the same verse. …