Resolve conflicts

In settings where multiple users are working on the same set of files, conflicts can occur. Helix Core Server enables your team to work on the same files simultaneously and resolve any conflicts that arise. For example, conflicts occur if two users change the same file (the primary concern in team settings) or you edit a previous revision of a file rather than the head revision.

When you attempt to submit a file that conflicts with the head revision in the depot, Helix Core Server requires you to resolve the conflict.

Merging changes from a development stream to a release stream is another typical task that requires you to resolve files.

To prevent conflicts, Helix Core Server enables you to lock files when they are edited. However, locking can restrict team development. Your team needs to choose the strategy that maximizes file availability while minimizing conflicts. For details, see Locking files.