-
Type:
Task
-
Resolution: Unresolved
-
Priority:
Major - P3
-
None
-
Affects Version/s: None
-
Component/s: None
-
Query Optimization
-
None
-
None
-
None
-
None
-
None
-
None
-
None
Often-times what appears to be a simple merge in git of two changes to the same golden test is actually incorrect, and the output needs to be regenerated after both commits are included.
We should try to force git to treat use binary diffing for golden test files, at least while detecting merge conflicts.