How conflicts occur

Conflicts can occur in a number of ways, for example:

1. Bruno opens //JamCode/dev/jam/command.c#8 for edit.
2. Gale subsequently opens the same file for edit in her own client workspace.
3. Bruno and Gale both edit //Jamcode/dev/jam/command.c#8.
4. Bruno submits a changelist containing //JamCode/dev/jam/command.c, and the submit succeeds.
5. Gale submits a changelist with her version of //Acme/dev/jam/command.c. Her submit fails.

If Helix Core Server accepts Gale’s version into the depot, her changes will overwrite Bruno’s changes. To prevent Bruno’s changes from being lost, Helix Core Server rejects the changelist and schedules the conflicting file to be resolved. If you know of file conflicts in advance and want to schedule a file for resolution, sync it. Helix Core Server detects the conflicts and schedules the file for resolution.