咕泡計(jì)算機(jī)網(wǎng)絡(luò)原理及應(yīng)用\/--》ccys1473
?在?A
?之前就拿到了中心倉庫的代碼,在?A push
?成功之后也對(duì)?f
?文件進(jìn)行了修改。這個(gè)時(shí)候?B
?也運(yùn)行?push
?命令推送代碼。
會(huì)收到一個(gè)類似下面的信息:
chenshu@sloop2:~/work/189/appengine$ git pushTo ssh://csfreebird@10.112.18.189:29418/appengine.git?! [rejected]??????? master -> master (non-fast-forward)error: failed to push some refs to 'ssh://csfreebird@10.112.18.189:29418/appengine.git'To prevent you from losing history, non-fast-forward updates were rejectedMerge the remote changes (e.g. 'git pull') before pushing again.? See the'Note about fast-forwards' section of 'git push --help' for details.
提醒你非快進(jìn)方式的更新被拒絕了,需要先從中心倉庫pull
到最新版本,merge
后再?push
.
fast forward
?能夠保證不會(huì)強(qiáng)制覆蓋別人的代碼,確保了多人協(xié)同開發(fā)。盡量不要使用?non fast forward
方法提交代碼。
標(biāo)簽: