Github user bbende commented on the issue:
https://github.com/apache/nifi/pull/2561
I tried to re-base this against master so I could squash it down to a
single commit, but the re-base is encountering a lot of conflicts, which really
shouldn't be happening because its conflicting with itself. Can you work
through getting it down to a single commit?
Normally it should just be:
`git rebase -i upstream/master`
Then in the list of commits you choose "s" for all the commits except the
top-one, which squashes them all into the top one. Then force push.
---
