ChengkaiYang2022 commented on PR #19496: URL: https://github.com/apache/flink/pull/19496#issuecomment-1114376209
> @ChengkaiYang2022 sorry for the late check. Would you mind resolving the conflicts before the review work ? Thanks a lot. @RocMarshal ,I see some pr discussions to use rebase command instead of merge command and squash commits before do that. So Is that Okay I follow these steps? 1. First, run `rebase -i Head~4`, to squash 4 commits in these PR into 1 commit and pust on my own remote branch. 2. In my local branch,run `git fetch origin master` and git `rebase origin/master` to solve the conflicts. In the last [PR](https://github.com/apache/flink/pull/19023), I use the merge command and unable to squash the commits into one commit after merged. Would you mind give me more details about how to solve the conflict, or like should we squash commits at the end of the review or at the very beginning of the review? I would like to have a clearer understanding of the community things, Thank you very much! -- 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]
