Merge branch 'dev' into f-new-debug-tree

.gitignore

@@ -18,3 +18,5 @@ start_caosdb_docker.sh
 src/doc/_apidoc
 /dist/
 *.egg-info
+venv/
+.backups
\ No newline at end of file

src/caoscrawler/crawl.py

@@ -185,6 +185,7 @@ def _treat_merge_error_of(newrecord, record):
     """
     for this_p in newrecord.properties:
         that_p = record.get_property(this_p.name)
+
         if that_p is None:
             logger.debug(f"Property {this_p.name} does not exist in the second entity. Note that "
                          "this should not be the reason for the merge conflict.")