john-okeefe
b44e4e4709
Clean up API documentation files by removing Phase X references: Remove 'API Explorer will be inserted here in Phase X' placeholders from: - 70+ API endpoint documentation files - Authentication endpoints (login, logout, register, refresh) - User endpoints (profile, settings, password) - Device endpoints (registration, sync, shelves) - Library endpoints (CRUD, folders, visibility) - Media endpoints (items, progress, highlights, notes) - Admin endpoints (users, analytics) - Sync endpoints (Kobo, KOReader) - OPDS endpoints - Scanner endpoints - Queue endpoints These placeholders were from planning documents and have no meaning to API consumers. The documentation is now clean and ready for use.
47 lines
950 B
Markdown
47 lines
950 B
Markdown
# Resolve Conflict
|
|
|
|
Resolve a specific conflict by choosing which version to keep.
|
|
|
|
**Endpoint**: `POST /api/conflicts/:id/resolve`
|
|
**Auth**: Required
|
|
**Content-Type**: `application/json`
|
|
|
|
## Path Parameters
|
|
|
|
| Parameter | Type | Required | Description |
|
|
|-----------|------|-----------|-------------|
|
|
| id | string (UUID) | Yes | Conflict UUID |
|
|
|
|
## Request Body
|
|
|
|
| Field | Type | Required | Description |
|
|
|--------|------|-----------|-------------|
|
|
| resolution | string | Yes | Resolution strategy: "device", "server", or "highest_progress" |
|
|
|
|
### Example Request
|
|
|
|
```json
|
|
{
|
|
"resolution": "device"
|
|
}
|
|
```
|
|
|
|
## Response (200 OK)
|
|
|
|
```json
|
|
{
|
|
"message": "Conflict resolved successfully",
|
|
"conflict_id": "uuid",
|
|
"resolution": "device"
|
|
}
|
|
```
|
|
|
|
## Error Responses
|
|
|
|
| Code | Description |
|
|
|------|-------------|
|
|
| 400 | Invalid resolution strategy |
|
|
| 401 | Invalid or expired token |
|
|
| 404 | Conflict not found |
|
|
| 400 | Conflict already resolved |
|