Skip to content
Snippets Groups Projects
Commit 3c20c092 authored by Alexander Schlemmer's avatar Alexander Schlemmer
Browse files

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

parents 9de1475b b0e45311
No related branches found
No related tags found
No related merge requests found
Pipeline #47894 failed
......@@ -18,3 +18,5 @@ start_caosdb_docker.sh
src/doc/_apidoc
/dist/
*.egg-info
venv/
.backups
\ No newline at end of file
......@@ -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.")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment