wuchong commented on pull request #15320: URL: https://github.com/apache/flink/pull/15320#issuecomment-824575259
Thanks @xinggit for the contribution, the translation looks good to me. However, please DO NOT use `git merge` to fix conflicts, otherwise, comitters need to resolve the conflicts when rebasing your branch. Please use `git rebase` to rebase your branch to latest master and fix conflicts. IntelliJ IDEA also provide an easy tool to do git rebase, you can find the tool via `VCS -> Git -> Rebase`. -- 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]
