git pull 之后有沖突:
$ git pull
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (2/2), done.
remote: Total 3 (delta 0), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From g:/software/repository/git/itheima26
50db030..a04027a? master? ? -> origin/master
Auto-merging readme.txt
CONFLICT (content): Merge conflict in readme.txt
Automatic merge failed; fix conflicts and then commit the result.
解決方法:
1.git mergetool
調用上面命令之后會提示你輸入編輯方法,輸入:beyond compare 進入編輯器.
2.編輯完之后.調用git commit -a 把當前目錄中所有都提交到本地庫中.
3.git push origin master 提交到遠程庫中.
git remote add origin https://github.com/tugenhua0707/testgit.git
<1>輸入git config --global user.name "你的用戶名"
<2>輸入git config --global user.email "你的郵箱"
<3>輸入git init
<4>輸入git remote add origin 你剛才建立的項目連接
<5>輸入git add .
<6>輸入git commit
<7>輸入git config http.postBuffer 524288000 (特別提醒: 此行是在本地設置緩存, 有些項目文件較大, 使用http無法上傳,可設置此命令)
<8>輸入git push -u origin master 將代碼推送到gitlab端
