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

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
  • Auth: none declared

Path parameters

spaceIdinteger required

Space id, from GET /spaces.

Query parameters

pathstring

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

fileNodeIdstring
conflictIdstring

Conflict id, instead of a path.

Headers

x-organization-idstring

Required when using OAuth bearer tokens.

Response

Both sides of the conflict and how it can be resolved.

conflictIdstring required
pathstring required
repoPathstring required
fileNodeIdstring nullable required
documentIdstring required
type'update' | 'remove' required

update: edited in the repository; remove: deleted there.

updatedAtstring required

Echo back when resolving; a newer conflict returns 409.

baseCommitShastring nullable required
localMarkdownstring required
remoteMarkdownstring nullable required
unifiedDiffstring required

Falconer version to repository version.

blockHunksFingerprintstring required
hasPendingSuggestionsboolean required
allowedResolutionsstring[] required

Changes

No recorded changes to this operation across all 1 revision of this API.