week15 << Previous Next >> week17

week16

這周有被抽到mini project的分組

倉儲:https://github.com/mdecourse/cdaw16-1/commits/master

在push的時候總會遇到相互衝突的時候而產生類似下面的文字提示

error: failed to push some refs to 'https://github.com/mdecourse/cdaw16-1'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

解決辦法:發生原因是來自於他人上傳而產生新檔案自己沒有這個新檔案而產生衝突，記得要先git pull再git push即可

當自己更新完網頁內容要push上去時，會提示你哪些檔案有發生衝突，這時要去他提示的路徑找檔案丟到編輯器把發生衝突的地方刪除再進行push就可以了。

week15 << Previous Next >> week17