mbien commented on PR #8003: URL: https://github.com/apache/netbeans/pull/8003#issuecomment-2506627612
https://github.com/apache/netbeans/pull/8006 an attempt to resolve the conflict without touching delivery. It clones **delivery** and edits the merge commit so that it is compatible with a merge back to master. -- 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
