joewitt commented on pull request #4167: URL: https://github.com/apache/nifi/pull/4167#issuecomment-768037221
This PR has been pretty difficult to get reviewed/merged because the commits create merge conflicts as noted previously and they then reference a merge commit which is an actual commit but that appears to alter the original commit. It isn't clear to me how these three commits were even constructed. Anyway, I've manually pulled in the first commit and modified to resolve the merge commits as best I can tell then pulled in the second commit. The third commit then appears not necessary. Assuming that goes well and builds I'll do a quick manual test. If that is fine will merge. Else will remove from this release for further effort. I still don't quite follow the true benefit this brings for genuine use cases but as long as it is helpful for the case(s)/users noted on this thread then seems ok. ---------------------------------------------------------------- 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]
