mattyb149 commented on pull request #4778: URL: https://github.com/apache/nifi/pull/4778#issuecomment-767670520
This PR needs some reorganization, maybe save off the commit(s) where you changed code then reset your branch to match the latest `main` branch. Then you can put your commits back into the branch (cleaning up any merge conflicts and such). Merging main into your branch usually ends up making things messy. ---------------------------------------------------------------- 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]
