john-okeefe
f859b2714d
- Move all files from bruno-yaml/* to bruno/* - Maintains existing directory structure within categories - Updates bruno/user/auth files with OAuth2 refresh token flow - Updates bruno/user/profile files for user profile management - Adds bruno/dashboard/ directory with dashboard API tests - Preserves all existing test scenarios and OpenCollection YAML format - No functional changes - file reorganization only
26 lines
622 B
YAML
26 lines
622 B
YAML
info:
|
|
name: Resolve Conflict
|
|
type: http
|
|
seq: 3
|
|
http:
|
|
method: POST
|
|
url: '{{base_url}}/api/conflicts/{{conflict_id}}/resolve'
|
|
auth: inherit
|
|
body:
|
|
type: json
|
|
jsonBody: "{\n \"winner\": \"koreader\",\n \"manual_data\": null,\n \"\
|
|
apply_to_all_future_conflicts\": false,\n \"reason\": \"User chose more recent\
|
|
\ progress\""
|
|
headers:
|
|
- key: Authorization
|
|
value: Bearer {{token
|
|
|
|
docs: |-
|
|
## Resolve Conflict
|
|
|
|
Resolves a sync conflict by choosing which source to use for the conflicting data.
|
|
|
|
**Method:** POST
|
|
|
|
**Endpoint:** /api/conflicts/{conflict_id
|