Currently we delegate the conflict resolution to the agent itself. Every update results in a new snapshot (version). If there's a conflict, then API returns an error code, which the agent can use and compare its file against the latest version.

There's definitely a more native way to support file conflict resolution, which will be a future improvement. For example, something like the API returns conflict information upon file upload.