Github user trixpan commented on the issue:
https://github.com/apache/nifi/pull/1016
@brianburnett
I suspect the reason for that is because you are trying to cherry-pick from
the branch you already have a commit.
Note how I suggested you to circle around...
First step is to create a new branch from master. If you master already has
the commit then you can use the upstream/master as a base (assuming you gave
the github.com/apache/nifi remote the name of upstream)
`git checkout origin master -b nifi-2724v2`
If you do `git log` you should see the last commit as being whatever has
been just published to the NiFi master git and also be told by `git status`
that you are using nifi-2724v2`
Now you perform a cherry pick that will copy your changes from the old
nifi-2742 branch into to the branch (i.e. nifi-2724v2) you just created.
---
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.
---
