[GitHub] [flink] yanchenyun edited a comment on pull request #16371: [FLINK-23198][Documentation] Fix the demo of ConfigurableRocksDBOptionsFactory in Documentation.

[GitBox]

yanchenyun edited a comment on pull request #16371:
URL: https://github.com/apache/flink/pull/16371#issuecomment-899952965


   @Myasuka i have rebase master, the conflict was resolved, and squash commits 
into one by using the tool which name is TortoiseGit. The branch tree looks 
normal as follows, 
   
   
![DingTalk1](https://user-images.githubusercontent.com/15646336/129655678-317d57c0-cc61-438b-b7aa-d6326c1600a8.png)
   
   However, some exceptions as follows when I push local git to remote 
yanchenyun/master
   
   
![Dingtalk_2](https://user-images.githubusercontent.com/15646336/129655964-06a476b8-69cf-4191-8c68-f69594179600.png)
   
   If this is correct, what should I do next？ THX!
   
   I have try the git pull  command, but the branch tree is messy again and 
shows no squash again.
   


-- 
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: issues-unsubscr...@flink.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org