Skip to main content
POST
/
api
/
v1
/
users
/
{custom_user_id}
/
merge-conflicts
/
{conflict_id}
/
resolve
{
  "conflict": {
    "id": "3c90c3cc-0d44-4b50-8888-8dd25736052a",
    "custom_user_id": "<string>",
    "project_user_session_id": "3c90c3cc-0d44-4b50-8888-8dd25736052a",
    "new_memory_content": "<string>",
    "conflicting_memories": [
      {
        "content": "<string>",
        "reason": "<string>"
      }
    ],
    "clarifying_questions": [
      {
        "question": "<string>",
        "options": [
          "<string>"
        ]
      }
    ],
    "status": "PENDING",
    "resolution_data": {
      "question_answers": [
        {
          "question": "<string>",
          "answer": "<string>",
          "message": "<string>"
        }
      ]
    },
    "created_at": "2023-11-07T05:31:56Z",
    "resolved_at": "2023-11-07T05:31:56Z"
  }
}

Headers

X-Recallr-Project-Id
string<uuid>
required
X-Recallr-Api-Key
string
required

Path Parameters

custom_user_id
string
required

User ID owning the merge conflict

conflict_id
string<uuid>
required

ID of the merge conflict to resolve

Body

application/json

Answers to clarifying questions

question_answers
UserResponseMergeConflictQuestion · object[]
required

Response

Merge conflict resolved successfully

Response after resolving a merge conflict.

conflict
object
required

Information about a merge conflict.