.
Some checks failed
Check / build (pull_request) Has been cancelled
E2E tests / build (pull_request) Has been cancelled
Publish CLI / publish-docker (pull_request) Has been cancelled
Publish server Docker image / publish-docker (pull_request) Has been cancelled

This commit is contained in:
Andras Schmelczer 2026-05-09 10:14:50 +01:00
parent 9e81343ab1
commit 3160e850ca
27 changed files with 292 additions and 107 deletions

View file

@ -35,7 +35,14 @@ export const deleteRecreateConcurrentUpdateTest: TestDefinition = {
{
type: "assert-consistent",
verify: (s: AssertableState): void => {
s.assertFileExists("A.md").assertContains("A.md", "recreated");
// The description commits to "client 0's recreated content
// preserved" — so pin to a single file at A.md with the
// recreated content. A deconflicted "updated by client 1"
// file would slip past assertContains/assertFileExists.
s.assertFileCount(1).assertContent(
"A.md",
"recreated by client 0"
);
}
}
]