This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
It's good to have diff and possibility to solve conflicts between java and uml projects. After disabling live roundtrip it's hard to track changes in source vs model, diff functionality may be really helpful.
acording to conover's comment in issue 86919 'smart merge/diff feature ... will likely be addressed in a future release'
Swoitching from "feature" to "enhancement". We use feature for release planning.