F force merge

Summary

Precondition for caosdb-crawler#47 (closed). Adds a force option to the merge_entities function that, instead of raising merge conflicts, overwrites the properties and attributes of entity A in case of conflicts.

Focus

Few changes in the merge_entities function and new unit test. Make sure that the default bahavior didn't change.

Test Environment

Unit tests should be sufficient.

Check List for the Author

Please, prepare your MR for a review. Be sure to write a summary and a focus and create gitlab comments for the reviewer. They should guide the reviewer through the changes, explain your changes and also point out open questions. For further good practices have a look at our review guidelines

• All automated tests pass
• Reference related issues
• Up-to-date CHANGELOG.md (or not necessary)
• Annotations in code (Gitlab comments)
  • Intent of new code
  • Problems with old code
  • Why this implementation?

Check List for the Reviewer

• I understand the intent of this MR
• All automated tests pass
• Up-to-date CHANGELOG.md (or not necessary)
• The test environment setup works and the intended behavior is reproducible in the test environment
• In-code documentation and comments are up-to-date.
• Check: Are there specifications? Are they satisfied?

For further good practices have a look at our review guidelines.

assigned to @florian

requested review from @henrik

added 1 commit

• c62941cf - DOC: Update changelog

Compare with previous version

marked the checklist item Reference related issues as completed

marked the checklist item All automated tests pass as completed

marked the checklist item Up-to-date CHANGELOG.md (or not necessary) as completed

marked the checklist item Annotations in code (Gitlab comments) as completed

resolved all threads

added 1 commit

• 8fb519ee - MAINT: rephrase docstring and slightly change test

Compare with previous version

marked the checklist item I understand the intent of this MR as completed

marked the checklist item All automated tests pass as completed

marked the checklist item Up-to-date CHANGELOG.md (or not necessary) as completed

marked the checklist item The test environment setup works and the intended behavior is reproducible in the test as completed

marked the checklist item In-code documentation and comments are up-to-date. as completed

marked the checklist item Check: Are there specifications? Are they satisfied? as completed

approved this merge request