git push : [rejected] master -> master (non-fast-forward)的问题

git push : [rejected] master -> master (non-fast-forward)的问题

问题描述：git push -u origin master
`

 $ git push origin master`
 To code.aliyun.com:xxx/Github.com:xxx
 ! [rejected]        master -> master (non-fast-forward)
 error: failed to push some refs to 'code.aliyun.com:xxx/Github.com:xxx'

解决方法：

1 git pull origin master --allow-unrelated-histories
//工作区和缓存区代码消除差异并合并

2. git add/gti commit
   3.git push origin master

事隔经年，就连CSDN的M语法都已如此成熟方便。却再也见不着那循环往复的少年心，蹉跎了韶华又抱负。只愿你从此花开，再无羁绊。