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.
[ BUILD # : 5.0 beta ] [ JDK VERSION : 1.4.2_xx ] Sometimes both changes made to a certain region of a file should be kept, i.e., when different methods are added to the end of a .java file. A new button, Apply both, should be added to both diff panels. Changes from the panel where the button was clicked should be applied first.
*** This issue has been marked as a duplicate of 25501 ***