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.
Use case: Do "merge changes" in order to, well, merge changes between two different SVN trees. Use "resolve conflicts" on (a bunch of) files / folders then in order to get things fixed. Actual behaviour: - In no situation whatsoever there is a real list of "changes" between revisions displayed. Both the "left" and the "right" side of the merge viewer are red, and there's only the option of accepting either the "left" or the "right" side as one big difference. - This is all the same for all kinds of files tested (XML, .java, .css, .html, .js) Expected behaviour: "Merge view" should actually display differences to merge in a line-by-line fasion to allow for really merging changes not just goin' for the "either-or-decision". This should work out-of-the-box for all NetBeans editor supported file types. So far, this does render the "Merge Changes" feature unusable.
Created attachment 62611 [details] merge view while trying to resolve conflicts in a .java file.
if you open a conflicted file in the editor the there should be conflicts markers surrounding a block of conflicting code. Now the question is how are they placed in your files - showing the whole file as in conflict with the other version or only at the relevant places you would expect? thanks.
hmmm, strange, it seems the whole file is marked as "conflicting" code in all possible cases... that at least does explain the very behaviour of the diff viewer...
well, the conflict markers are created by the svn command line the nb svn module uses. I'm afraid this is something we can't help you with:( however, feel free to reopen in case you should be able to merge from the cli without the described misbehavior *** This issue has been marked as a duplicate of 131432 ***