Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
@david-streamlio Ok, I think I figured out what happened. At some point, it
looks like you accidentally did a pull on upstream master into your branch. The
fact that you keep having over 200 commits even with rebasing against master
very strongly suggests that. What I did to verify was I checked out your
branch, pushed it to my fork and saw 210ish commits with a merge conflict into
my master. So I locally rebased against master, did a forced push and it
dropped it down to ~7 commits.
So carefully follow the four steps I gave you:
1. git checkout master
2. git pull upstream master
3. git checkout NIFI-4914
4. git rebase master
**Make sure** that `upstream` is changed to whatever you call `apache/nifi`
on github.com. The do:
`git push origin --force NIFI-4914` and it should all clear up to a few
commits.
---
