conflict

Sync conflicting changes.

Suggest Edits

Sync conflicts are files that have pending local and remote changes. Sync can not automatically decide which change to keep.

Usage: sync conflict list

List sync conflicts.

Example:

sync> conflict list
/Users/joe/docs/overview.rtf
sync>

Usage: sync conflict ignore

Ignore conflicting changes. Leave the file in conflict and ignore the changes.

Parameters:

  • pattern: Conflict file name or path.

Example:

sync> conflict ignore overview.rtf
/Users/joe/docs/overview.rtf: IGNORED CONFLICT
sync>

Usage: sync conflict rename

Keep all changes. Rename the local file to resolve the conflict.

Parameters:

  • pattern: Conflict file name or path.

Example:

sync> conflict rename *.rtf
/Users/joe/docs/overview1.rtf: UPLOADED
/Users/joe/docs/overview.rtf: DOWNLOADED
sync>

Usage: sync conflict download

Discard the local change and download the remote change to replace it.

Parameters:

  • pattern: Conflict file name or path.

Example:

sync> conflict download overview.rtf
/Users/joe/docs/overview.rtf: DOWNLOADED
sync> conflict
No conflicts found.
sync>

Usage: sync conflict upload

Discard the remote change and upload the local change to replace it.

Parameters:

  • pattern: Conflict file name or path.

Example:

sync> conflict
/Users/joe/docs/overview.rtf
sync> conflict upload overview.rtf
/Users/joe/docs/overview.rtf: UPLOADED
sync> conflict
No conflicts found.
sync>

Updated about 4 years ago