Github user ToivoAdams commented on the issue:
https://github.com/apache/nifi/pull/984
@trixpan
I did rebase, resolved conflicts.
Git refused to push. So I used force push.
toivo@Optx:~/git/nifi$ git push origin -f nifi-2624
Counting objects: 2712, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (1079/1079), done.
Writing objects: 100% (2712/2712), 2.51 MiB | 1.81 MiB/s, done.
Total 2712 (delta 952), reused 2399 (delta 740)
remote: Resolving deltas: 100% (952/952), completed with 402 local objects.
To [email protected]:ToivoAdams/nifi.git
+ 7e33a04...540ef63 nifi-2624 -> nifi-2624 (forced update)
Now PR is closed?
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
