Akshay-Gupta-Oracle commented on pull request #2282: URL: https://github.com/apache/netbeans/pull/2282#issuecomment-704730769
@lkishalmi I've resolve the conflict with master. But after resolving I had to merge master into this branch, so now I can't rebase my local branch and squash the commits. may need help there. ---------------------------------------------------------------- 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. 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
