Improve error message: 'Conflicting lineage in attribute'

claude · claude · commit daf6c36f7fad · 2025-12-24T16:54:47.000Z
diff --git a/datajoint/condition.py b/datajoint/condition.py
@@ -163,7 +163,7 @@ def assert_join_compatibility(expr1, expr2):
         # None lineages are never homologous (not even with each other)
         if lineage1 is None or lineage2 is None or lineage1 != lineage2:
             raise DataJointError(
-                f"Mismatched attribute '{attr}' has no matching lineage. "
+                f"Conflicting lineage in attribute '{attr}'. "
                 f"Use .proj() to rename it in one of the operands."
             )
 

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ def assert_join_compatibility(expr1, expr2):`
`163`	`163`	`# None lineages are never homologous (not even with each other)`
`164`	`164`	`if lineage1 is None or lineage2 is None or lineage1 != lineage2:`
`165`	`165`	`raise DataJointError(`
`166`		`- f"Mismatched attribute '{attr}' has no matching lineage. "`
	`166`	`+ f"Conflicting lineage in attribute '{attr}'. "`
`167`	`167`	`f"Use .proj() to rename it in one of the operands."`
`168`	`168`	`)`
`169`	`169`