Github user bbende commented on the issue:
https://github.com/apache/nifi/pull/2561
Yea when you update your branch you should be doing something like the
following...
```
git fetch upstream
git rebase upstream/master
```
This assumes "upstream" points to either Apache NiFi git repo or Apache
NiFi Github.
Using rebase will apply all the incoming commits from upstream/master to
your branch and then put your commits back on top of that so it looks like
yours are always the latest.
You then need to force push to your remote branch `git push origin
your-branch --force`
---
