Cannot edit code in netbeans while managing merge conflict in file

Question

I work with Git and Netbeans. Both tools are awesome. I just have a little problem trying to resolve a merge conflict between a file: I cannot edit the code. I can choose only among the codes that appear in the resolution of merge conflicts. But I would like to have more options: - save changes to both files; - adding changes to the file However, since I do not allow editing files in Netbeans, I cannot do this. I think this is possible if I edit the file as a txt document using Notepad ++. However, I would rather stay in a Netbeans environment.

Thank you very much.

Answer 1

This is currently not possible :( Corresponding error here: http://netbeans.org/bugzilla/show_bug.cgi?id=141198 You should vote for it, so I hope it will be added sooner because it is a sore point in NB .