mbien commented on PR #7548: URL: https://github.com/apache/netbeans/pull/7548#issuecomment-2249801008
``` [PR branch] git pull --rebase https://github.com/apache/netbeans.git master [fix merge conflict] git add java/java.hints/src/org/netbeans/modules/java/hints/infrastructure/JavaErrorProvider.java git rebase --continue ``` should work I think. It would put the commit on top of latest 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
