The Merge conflicts resolver, allows one to choose the changes in one file or the other. There are many times that
changes have been made on the same line in each file, but are unrelated and thus we need both changes. Just as a
suggestion, the Cervesia conflict resolver (part of KDevelop), does this by adding two options of "A+B" and "B+A".
It would also be nice to be able to directly edit the merged result in the resolver too.
Reassigning to diff. It's a general issue for all VCSs supported by the IDE.
*** Bug 208431 has been marked as a duplicate of this bug. ***
sjh mentioned a good point I know from beyond compare, too, but miss in netbeans. I'm not quite sure if there is any possibility to "activate" the ability to directly edit the "Result after merge" tab.
"It would also be nice to be able to directly edit the merged result in the resolver too."
(In reply to tekercibasi from comment #4)
> "It would also be nice to be able to directly edit the merged result in the
> resolver too."
That would be this: https://netbeans.org/bugzilla/show_bug.cgi?id=212811