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.
Development build #200510251800 of NetBeans 5.0 Windows XP, JDK 1.5.0_05 EA build #02 Description: ============ User can't resolve merge conflicts correctly as IDE throws below attached exception on each press of "OK" button when result should be saved to disk. Luckily, the file is saved correctly however user has to close the window using "Cancel" button which is very confusing. I am attaching both conflicting versions so that you can hopefully reproduce it. When resolving conflicts I always used remote modifications i.e. pressed "Accept and Next" in the DayView_remote.java pane. Finally pushed "OK". I was asked to confirm my decision to save the file but when I pressed "OK" button the exception was thrown.
Created attachment 26347 [details] Exception thrown when "OK" was pushed.
Created attachment 26348 [details] Remote version of the file I was updating to.
Created attachment 26349 [details] Local version of the file I was trying to update.
Can somebody please take a look at the exception ?
Do you also have the original file (the one which local and remote are based on)? Or better, can you attach the conflict file here (with >>>> markers)?
No, I don't have it, sorry. Can't you produce it yourself from the two revisions ?
The base file - you should have it in your repository (ideally it is one revision behind the remote file). I will be able to reproduce the conflict file then.
I see. In such case I believe it's this: http://cvs.sourceforge.net/viewcvs.py/*checkout*/rachota/rachota/src/org/cesilko/rachota/gui/DayView.java?rev=1.9
I tried to reproduce it but changes in remote and local are not in conflict.
*** This issue has been marked as a duplicate of 65970 ***
Verified as duplicate.