About editing conflicts in the Files tool

The Files tool allows all workspace members to open the same files simultaneously. Depending on editing permissions, multiple members may also be able to edit the same file simultaneously, and save changes back to Groove.  If this happens, an editing conflict occurs and Groove takes the following steps to preserve everyone's work, and to provide a path for resolving the conflict:

When such editing conflicts occur, members should communicate to determine how they can best resolve or merge their files.