Developer Hub

Welcome to the Oxygen developer hub. You'll find comprehensive guides and documentation to help you start working with oxygen as quickly as possible, as well as support if you get stuck. Let's jump right in!

Get Started    

conflicts

Manage sync conflicts

A conflict is a file that has been updated in multiple places before it has had a chance to sync. This can happen if you modify the copy of a file in your local folder while you are offline or not running syncd, while someone else is updating the copy in your cloud folder. When you come back online or restart syncd, the file will be listed as a conflict.

conflicts [list]

Print list of current sync conflicts.

Example:

sync> conflicts
file1.rtf /Users/joe/docs/file1.rtf

conflicts ignore [<name-or-path>]

Ignore change and don't sync.

Parameters:

  • name-or-path: Conflict file name or path.

Example:

sync> conflicts ignore file1.rtf
Ignoring file1.rtf.

conflicts choose <name-or-path>

Start conflict resolution process.

Parameters:

  • name-or-path: Conflict file name or path.

Example:

sync> conflicts choose file1.rtf
Conflicting versions:
1) 2019-07-22 18:26:42 62123 /Users/joe/docs/file1.rtf
2) 2019-07-24 14:04:36 58042 /dropbox/mydropbox/file1.rtf
Which version do you want to keep?
Enter Version Number  [1, 2]: 2
Download requested. Use "monitor" to see activity.

conflicts


Manage sync conflicts

Suggested Edits are limited on API Reference Pages

You can only suggest edits to Markdown body content, but not to the API spec.