From 50561dd05f16555faa2b1ca065f54421060d7313 Mon Sep 17 00:00:00 2001
From: florian <f.spreckelsen@inidscale.com>
Date: Tue, 8 Nov 2022 18:00:21 +0100
Subject: [PATCH] WIP: Resolve merge conflict
---
src/caoscrawler/crawl.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/caoscrawler/crawl.py b/src/caoscrawler/crawl.py
index ad77e678..0aecb58d 100644
--- a/src/caoscrawler/crawl.py
+++ b/src/caoscrawler/crawl.py
@@ -718,7 +718,13 @@ class Crawler(object):
elif self.get_from_any_cache(record) is not None:
# We merge the two in order to prevent loss of information
newrecord = self.get_from_any_cache(record)
- merge_entities(newrecord, record)
+ try:
+ merge_entities(newrecord, record)
+ except RuntimeError as re:
+ if "Merge conflict" in str(re):
+ continue
+ else:
+ raise re
Crawler.bend_references_to_new_object(
old=record, new=newrecord, entities=flat+to_be_updated+to_be_inserted)
--
GitLab