We need to decide whether or not obstructions should be flagged as tree conflicts.
I think that some time before the 1.6.0 release, we decided that obstructions
should not cause conflicts to be flagged. I think the rationale was that
obstructions are not versioned and conflicts only make sense on versioned items.
In r959735, some obstruction cases were changed to cause tree conflicts,
resulting in failing tests in the JavaHL bindings. It's unclear whether the
test's expectations should be changed, or whether flagging tree conflicts on
obstructions is what we want to do.
Major