mbien commented on issue #6944: URL: https://github.com/apache/netbeans/issues/6944#issuecomment-1886708128
nevermind, this isn't going to be that easy. The diff view of the result panel only expects content from the two source panels so that functionality would have to go (line numbers would break too). Save action would have to be disabled otherwise the document could be saved before `ok` is pressed etc. https://github.com/mbien/netbeans/tree/editable-git-merge-conflicts-panel -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
