List resolved conflicts
curl --request GET \
--url http://127.0.0.1:4319/memory/conflicts/resolvedimport requests
url = "http://127.0.0.1:4319/memory/conflicts/resolved"
response = requests.get(url)
print(response.text)const options = {method: 'GET'};
fetch('http://127.0.0.1:4319/memory/conflicts/resolved', options)
.then(res => res.json())
.then(res => console.log(res))
.catch(err => console.error(err));package main
import (
"fmt"
"net/http"
"io"
)
func main() {
url := "http://127.0.0.1:4319/memory/conflicts/resolved"
req, _ := http.NewRequest("GET", url, nil)
res, _ := http.DefaultClient.Do(req)
defer res.Body.Close()
body, _ := io.ReadAll(res.Body)
fmt.Println(string(body))
}<?php
$curl = curl_init();
curl_setopt_array($curl, [
CURLOPT_PORT => "4319",
CURLOPT_URL => "http://127.0.0.1:4319/memory/conflicts/resolved",
CURLOPT_RETURNTRANSFER => true,
CURLOPT_ENCODING => "",
CURLOPT_MAXREDIRS => 10,
CURLOPT_TIMEOUT => 30,
CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
CURLOPT_CUSTOMREQUEST => "GET",
]);
$response = curl_exec($curl);
$err = curl_error($curl);
curl_close($curl);
if ($err) {
echo "cURL Error #:" . $err;
} else {
echo $response;
}require 'uri'
require 'net/http'
url = URI("http://127.0.0.1:4319/memory/conflicts/resolved")
http = Net::HTTP.new(url.host, url.port)
request = Net::HTTP::Get.new(url)
response = http.request(request)
puts response.read_bodyHttpResponse<String> response = Unirest.get("http://127.0.0.1:4319/memory/conflicts/resolved")
.asString();using RestSharp;
var options = new RestClientOptions("http://127.0.0.1:4319/memory/conflicts/resolved");
var client = new RestClient(options);
var request = new RestRequest("");
var response = await client.GetAsync(request);
Console.WriteLine("{0}", response.Content);
{
"conflicts": [
{
"id": "<string>",
"createdAt": "2023-11-07T05:31:56Z",
"incoming": {
"id": "<string>",
"canonical": "<string>",
"content": "<string>"
},
"candidates": [
{
"id": "<string>",
"canonical": "<string>",
"content": "<string>",
"relation": "contradictory",
"reason": "<string>"
}
],
"resolution": "keep_new",
"resolvedAt": "2023-11-07T05:31:56Z"
}
]
}Conflicts
List resolved conflicts
The revertable history behind the pending queue, newest resolution first. Each entry carries the action that resolved it and can be undone via the revert endpoint.
GET
/
memory
/
conflicts
/
resolved
List resolved conflicts
curl --request GET \
--url http://127.0.0.1:4319/memory/conflicts/resolvedimport requests
url = "http://127.0.0.1:4319/memory/conflicts/resolved"
response = requests.get(url)
print(response.text)const options = {method: 'GET'};
fetch('http://127.0.0.1:4319/memory/conflicts/resolved', options)
.then(res => res.json())
.then(res => console.log(res))
.catch(err => console.error(err));package main
import (
"fmt"
"net/http"
"io"
)
func main() {
url := "http://127.0.0.1:4319/memory/conflicts/resolved"
req, _ := http.NewRequest("GET", url, nil)
res, _ := http.DefaultClient.Do(req)
defer res.Body.Close()
body, _ := io.ReadAll(res.Body)
fmt.Println(string(body))
}<?php
$curl = curl_init();
curl_setopt_array($curl, [
CURLOPT_PORT => "4319",
CURLOPT_URL => "http://127.0.0.1:4319/memory/conflicts/resolved",
CURLOPT_RETURNTRANSFER => true,
CURLOPT_ENCODING => "",
CURLOPT_MAXREDIRS => 10,
CURLOPT_TIMEOUT => 30,
CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
CURLOPT_CUSTOMREQUEST => "GET",
]);
$response = curl_exec($curl);
$err = curl_error($curl);
curl_close($curl);
if ($err) {
echo "cURL Error #:" . $err;
} else {
echo $response;
}require 'uri'
require 'net/http'
url = URI("http://127.0.0.1:4319/memory/conflicts/resolved")
http = Net::HTTP.new(url.host, url.port)
request = Net::HTTP::Get.new(url)
response = http.request(request)
puts response.read_bodyHttpResponse<String> response = Unirest.get("http://127.0.0.1:4319/memory/conflicts/resolved")
.asString();using RestSharp;
var options = new RestClientOptions("http://127.0.0.1:4319/memory/conflicts/resolved");
var client = new RestClient(options);
var request = new RestRequest("");
var response = await client.GetAsync(request);
Console.WriteLine("{0}", response.Content);
{
"conflicts": [
{
"id": "<string>",
"createdAt": "2023-11-07T05:31:56Z",
"incoming": {
"id": "<string>",
"canonical": "<string>",
"content": "<string>"
},
"candidates": [
{
"id": "<string>",
"canonical": "<string>",
"content": "<string>",
"relation": "contradictory",
"reason": "<string>"
}
],
"resolution": "keep_new",
"resolvedAt": "2023-11-07T05:31:56Z"
}
]
}Headers
The owner this request acts for. Applies to every owner-scoped endpoint, reads as well
as writes. Omit it and the daemon's own default owner answers (see GET /health), which
is what a single-owner install has always used. A value that is not a uuid is refused
with 400 rather than coerced.
Response
200 - application/json
Resolved conflicts.
Hide child attributes
Hide child attributes
The action that resolved it.
Available options:
keep_new, keep_existing, keep_both, merge