Github user MikeThomsen commented on the issue:
https://github.com/apache/nifi/pull/2614
@david-streamlio you brought in a whole lot of commits from other people
with that merge from upstream/master. I checked out your branch and did a
rebase on it (`git rebase master`) and that seemed to clear it up. I would
recommend doing that on your branch locally and verifying that that "merge
commit" with the commit message `Merge remote-tracking branch 'upstream/master'
into NIFI-4914` goes away.
As a rule of thumb, this is how you want to do this sort of update:
1. git checkout master
2. git pull upstream master
3. git checkout YOUR_BRANCH
4. git rebase master
Once you've done that, the last command will replay your commits on top of
the most recent version of upstream/master.
---
