master -> master (non-fast-forward)和git ! [rejected] master -> master (fetch first)

解决方法参照以下链接：

https://blog.csdn.net/junruitian/article/details/78163576