post/api/v1/two-way-sync/{spaceId}/files/conflict/resolve

Request

  • Base URL: https://falconer.com (the document declares no server; this is the origin it was published from)
  • URL: https://falconer.com/api/v1/two-way-sync/{spaceId}/files/conflict/resolve
  • Auth: none declared

Path parameters

spaceIdinteger required

Space id, from GET /spaces.

Headers

x-organization-idstring

Required when using OAuth bearer tokens.

Request body

pathstring

Path relative to the sync root. Pass this or fileNodeId.

fileNodeIdstring
conflictIdstring

Conflict id from list_two_way_sync_conflicts, instead of a path.

updatedAtstring date-time required
pushboolean

Push the result to the repository after resolving. Only reject and apply_merged push; keep_local queues the file to be recreated, so push it afterwards with push_file.

Response

The conflict was resolved.

conflictIdstring required
pathstring required
resolution'keep_local' | 'archive_local' | 'apply_full' | 'reject' | 'apply_merged' required

Changes

No recorded changes to this operation across all 2 revisions of this API.