datbates opened a new issue, #6944: URL: https://github.com/apache/netbeans/issues/6944
### Apache NetBeans version Apache NetBeans 20 ### What happened This used to work. it was fixed in this archived bug: https://bz.apache.org/netbeans/show_bug.cgi?id=141198 but seems to have reappeared ### Language / Project Type / NetBeans Component _No response_ ### How to reproduce 1. Merge a branch generating a git conflict. 2. Select a change to accept or both 3. Try to change the result in the lower pane. 4. An edit cursor appears but editing is not allowed ### Did this work correctly in an earlier version? Apache NetBeans 13 or earlier ### Operating System Mac OS 14.1.2 (23B2091) ### JDK OpenJDK Runtime Environment AdoptOpenJDK (build 15.0.2+7) ### Apache NetBeans packaging Apache NetBeans provided installer ### Anything else _No response_ ### Are you willing to submit a pull request? Yes -- 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
