mattyb149 commented on pull request #5318: URL: https://github.com/apache/nifi/pull/5318#issuecomment-929283337
There's a merge conflict now, and since you have a couple of merge commits in this PR, I recommend cleaning it up by rebasing or squashing merge commits or whatever, so your only commits are your changes to the code (and there are no merge conflicts), thanks! -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
