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.
See issue 21190
reassigning to new writer
switching milestone according to final doc plan
Created help topic (vcs-nb/cvs-nb/cvs_merge-resolver.html).