Github user matthiasblaesing commented on the issue:
https://github.com/apache/incubator-netbeans/pull/31
The problem is that you added the license headers, that conflicted with the
central change the @jlahoda kindly did (fixing a great many files). Now your
changeset removes these headers again. On github you can see in the "Files
changed" section what would happen if your PR is merged and in this case the
correct headers are removed for form files.
So:
- please rebase your changes onto master
- please revert your changes to the form files
- please also revert the change to genfiles.properties (See:
https://github.com/apache/incubator-netbeans/pull/46/commits/40a715ad91e47696a8018c48c7ad091b9c4341ec)
as that is a generated file
The rest looks good. The whitespace changes in build.xml are the removal of
trailing spaces, which I think is ok.
---
