matthiasblaesing commented on PR #6585: URL: https://github.com/apache/netbeans/pull/6585#issuecomment-1774050490
> is the ide/extbrowser/manifest.mf conflict something I need to resolve? Yes please. The release branch for NetBeans 20 was created a few days ago and as part of branching in master the next development iteration is prepared by incrementing the minor versions (see https://github.com/apache/netbeans/commit/3efd651e73d2775fe694949015d5351ba7fe01f4). > when is testing taking place? Testing as in "tests run on github" happens once it is cleared by a committer. The "Checks" page in the PR shows the status of the automatic tests, once they are run. This all assumes that you did local checks. A manual test with you modified code is possible running `ant` to build netbeans and then `ant tryme` to startup the freshly build NetBeans with a test userdir. The automatic tests can be ran with `ant -f <dir_of_module> test` (for example `ant -f ide/extbrowser test`) or invoking "Test" from the context menu of the project in the IDE. > I've worked out the Advapi32Util for getting the browser executable, I can merge it into my pull request but I don't know whether it's too late for the latest round of testing. This would be good from my POV. > Additionally I've just realized that I haven't done a commit squash as set out in the Contributing Code Guidelines but I can't see the option in netbeans git menu or in github itself, is this something that needs to done through git cli? If I remember correctly NetBeans does not have a GUI for rebasing and I would not trust the github options. Github destroys author information and that is not acceptable from my POV, so I normally use git cli. This might help: https://git-scm.com/docs/git-rebase#_interactive_mode Before doing a rebase with your work branch (`java_registry_read`) I suggest you try it first on a copy of the branch. -- 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
