yulei0824 commented on pull request #14840: URL: https://github.com/apache/flink/pull/14840#issuecomment-785799012
> Hi @yulei0824 , please do not use "git merge" to rebase branches, otherwises it's hard to track the commits. It would be better to use "git rebase". I have resolved 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: [email protected]
