---
title: "GET /api/v1/two-way-sync/{spaceId}/files/conflict"
method: GET
path: "/api/v1/two-way-sync/{spaceId}/files/conflict"
---

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

`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

- `spaceId` integer, required: Space id, from GET /spaces.

## Query parameters

- `path` string: Path relative to the sync root. Pass this or fileNodeId.
- `fileNodeId` string
- `conflictId` string: Conflict id, instead of a path.

## Headers

- `x-organization-id` string: Required when using OAuth bearer tokens.

## Response `200`

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

- FileConflict
  - `conflictId` string, required
  - `path` string, required
  - `repoPath` string, required
  - `fileNodeId` string, nullable, required
  - `documentId` string, required
  - `type` 'update' | 'remove', required: update: edited in the repository; remove: deleted there.
  - `updatedAt` string, required: Echo back when resolving; a newer conflict returns 409.
  - `baseCommitSha` string, nullable, required
  - `localMarkdown` string, required
  - `remoteMarkdown` string, nullable, required
  - `unifiedDiff` string, required: Falconer version to repository version.
  - `blockHunks` object[], required
    - `id` string, required
    - `op` 'context' | 'changed', required
    - `local` string[], required
    - `remote` string[], required
  - `blockHunksFingerprint` string, required
  - `hasPendingSuggestions` boolean, required
  - `allowedResolutions` string[], required

## Other responses

- `400`: Bad request, or a folder that is not the sync root
- `403`: Permission is missing
- `404`: Folder not synced, or file not found
- `422`: Not a markdown page

---

[API](https://skmtc.dev/falconer/apis/falconer-public-api.md) · [All operations](https://skmtc.dev/falconer/apis/falconer-public-api/llms.txt) · [OpenAPI document](https://skmtc.dev/falconer/apis/falconer-public-api/revisions/7b303b7ddf6a?raw)