Summary

For #127 (closed). This just improves the original error message and does not introduce additional error handling.

Focus

Since it was highly non-trivial to introduce error handling that could actually distinguish between (cf. docstring of new test) not being able to merge b1 and b2 because of unresolvable merge conflicts in c1 and c2 and only having to postpone the merge because of apparent merge conflicts that will be resolved down the line, we do not introduce new error handling. Instead, we point out that the error with missing referencing identifiables might be due to merge conflicts in the referencing entities.

Test Environment

Unit test

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)
• Up-to-date JSON schema (or not necessary)
• Appropriate user and developer documentation (or not necessary)
  • How do I use the software? Assume "stupid" users.
  • How do I develop or debug the software? Assume novice developers.
• 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)
• Appropriate user and developer documentation (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.