KuKuDeCheng commented on pull request #4551: URL: https://github.com/apache/nifi/pull/4551#issuecomment-783853219
> There are merge conflicts, can you resolve? It's not recommended to merge main into your branch since we will be merging the other way when approved, might be a better idea to get a new branch (based off the latest main) and cherry-pick in your commits. I have tried resolve these conflicts not by merge, but some conflicts are difficult to resolve manually. The code has changed a lot，Some code conflicts are weird. So I decided to merge the code and re-test ---------------------------------------------------------------- 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: [email protected]
