Github user ToivoAdams commented on the issue:
https://github.com/apache/nifi/pull/803
Git complained and I did what he recommend (git pull origin).
It seems this was mistake.
I will create another clean PR.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
