yangyichao-mango commented on pull request #12313: URL: https://github.com/apache/flink/pull/12313#issuecomment-644759149
> @yangyichao-mango thanks for the work, could you please use `git rebase` instead of `git merge` to resolve the conflict. Thx a lot for your review. I've rebased the branch and resolve the conflicts. ---------------------------------------------------------------- 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: us...@infra.apache.org
