yiduwangkai commented on issue #9164: [FLINK-12894][doc][Chinese-translation]add Chinese documentation of how to configure and use catalogs in SQL CLI URL: https://github.com/apache/flink/pull/9164#issuecomment-513566443 Why is there a new merge commit extra information, because I use the pull command to pull the latest code of the upstream branch, this record will be generated if the local branch lags behind the upstream branch kai wang <yiduwang...@gmail.com> 于2019年7月21日周日 下午11:28写道： > yes i used rebase at first, But when I execute this command, when I push, > git asks for pull, maybe it is improper operation before, causing the > situation to be merged when the pull occurs, but please be assured that no > other files have been changed. thx > > Jark Wu <notificati...@github.com> 于2019年7月21日周日 下午10:19写道： > >> @yiduwangkai <https://github.com/yiduwangkai> , please rebase your >> commit on the latest master and do not use "merge". >> >> — >> You are receiving this because you were mentioned. >> Reply to this email directly, view it on GitHub >> <https://github.com/apache/flink/pull/9164?email_source=notifications&email_token=AD2ZDBFT26AVY4Q23H3A7K3QARV63A5CNFSM4IE2BQKKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD2OEPGA#issuecomment-513558424>, >> or mute the thread >> <https://github.com/notifications/unsubscribe-auth/AD2ZDBFZCY2L4D3U63X2CG3QARV63ANCNFSM4IE2BQKA> >> . >> >
---------------------------------------------------------------- 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 With regards, Apache Git Services
