F merge conflict error

Summary

Precondition for https://gitlab.indiscale.com/caosdb/customers/leibniz-zmt/management/-/issues/133. Introduces an EntityMergeConflictError class that's raised in case of merge conflicts in apiutils.merge_entities.

Focus

New error class in apiutils.

Test Environment

unittest 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

marked the checklist item Reference related issues 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

marked the checklist item All automated tests pass as completed

requested review from @daniel

added 1 commit

• 9191afa8 - ENH: A bit more informative error message.

Compare with previous version

added 1 commit

• d575fc54 - TEST: Testing special attributes merge conflict error msg.

Compare with previous version

resolved all threads

marked the checklist item I understand the intent of this MR 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

enabled an automatic merge when the pipeline for d575fc54 succeeds

mentioned in commit 9410d638

merged