MikeThomsen commented on pull request #3317: URL: https://github.com/apache/nifi/pull/3317#issuecomment-715299764
@adamfisher A decent bit has changed in our git history since 6/2019, including us switching to `main` from `master`. I tried doing a rebase first to master and then to main yesterday and ran into some significant problems with a few commits you did in there that have "no message" as their subject line. The solution that worked for me was to squash your core commits (the top ones with good messages on them) and then cherry pick them to a branch based off of main. After all that, the unit tests failed for various reasons including your handling of flowfile io streams. Not a big deal. I'll try to clean this up for you and push a new branch up that preserves your contribution so we can get past the Git issues and such. I'll tag you and you can just pull my copy if you want to make changes and then send updates to my branch instead of fighting with Git. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org
