exceptionfactory commented on PR #7537: URL: https://github.com/apache/nifi/pull/7537#issuecomment-1696210711
> @ChrisSamo632 I am not sure I can do anything regarding these conflicts. I already incorporated the changes of #7441 for `PutElasticsearchRecord` and other related changes. As for the groovy files, naturally there will be a conflict as my branch deleted them and replaced them with Java files. @dan-s1 You will need to rebase your PR and then force-push to this feature branch to resolve the conflicts. If you have already incorporated the changes, then during the rebase process, you should be able to just mark the `groovy` files as deleted, but the change to `PutElasticsearchRecord` needs to be incorporated. -- 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]
