diff --git a/src/caoscrawler/crawl.py b/src/caoscrawler/crawl.py index ad77e678a31a9bd950c89019f38ce58a20d9c2e3..0aecb58dfc2088cacdfc685dcd37c7736d40d7e7 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)