Handling Conflicts

If more users edit the same file, conflict occurs. In such case, the Designer informs the user and the user should solve it.

Conflicts are rare and you can avoid them with a suitable workflow: it's not a good idea that more users work within the same sandbox at the same time, unless they communicate well to each other to avoid conflicts and unintentional overwriting of files.

When conflict is detected, new files appear. The file names are derived from the conflicted file name, timestamp, and conflict-denoting suffix. E.g., conflict in MyFile.grf creates MyFile_2016-02-25_13_45_56_conflict_local.grf and MyFile_2016-02-25_13_45_56_conflict_remote.grf.

You shall resolve conflict yourself. You are asked to choose one from the options: Open in compare editor Resolve the conflict using the local file, or Resolve the conflict using remote file.