better handling of merging the data in the combine, lead to not needing to handle duplicates

2024-08-12 16:51:06 +01:00
parent e54d48de5d
commit a966ad5ebd
2 changed files with 43 additions and 17 deletions
@@ -9,4 +9,5 @@ FORBIDDEN = 7
 NOT_FOUND = 8
 CONFLICT = 9
 MOVE_FILE_ERROR = 10
-DUPLICATE_RESOLUTION_ERROR = 11
+DUPLICATE_RESOLUTION_ERROR = 11
+UNIQUE_ID_NOT_FOUND = 12