用了又忘记,还是写一下吧
1.ssh公钥配对后,本地验证
2.合并有冲突Automatic merge failed; fix conflicts and then commit the result.(分2种情况,舍弃线上的合并至本地,或舍弃本地用线上的)
解决参考:https://blog.csdn.net/trochiluses/article/details/10100719
3.git clone指定分支
git clone -b 5.1 https://gitee.com/liu21st/thinkphp5.git tp5