Code

Minor fixes for Resolve Conflict#1037

Code

Merged

sadiqkhoja merged 4 commits intogetodk:mastergetodk/central-backend:masterfrom sadiqkhoja:features/entities/fix-resolve-conflictsadiqkhoja/central-backend:features/entities/fix-resolve-conflictCopy head branch name to clipboardNov 6, 2023

+75-12

Commits

Commits on Oct 31, 2023

• Fixes: it should not resolve if resolve flag is not true

  sadiqkhoja

  committed
  42d3ab6

• Fixes: set updatedAt on resolve conflict

  sadiqkhoja

  committed
  2b4a807

• Check for If-Match before resolve conflict

  sadiqkhoja

  committed
  673d200

Commits on Nov 6, 2023

• changed the title of the test

  sadiqkhoja

  committed
  3b75532