如果对git命令行不熟悉的话,用git图形界面工具,就比较合适了。建议使用tortoisegit这样的工具,命令行从学习到灵活掌握的时间成本比较高的。 1,添加 # git clone git@192, but this does not map back to the address - POSSIBLE BREAK-IN ATTEMPT! To git@192, but this does not map back to the address - POSSIBLE BREAK-IN ATTEMPT! 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 192.168.10.202:develop/test 367dad3..5e5640b master -> origin/master Auto-merging test.txt CONFLICT (content): Merge conflict in test.txt Automatic merge failed; fix conflicts and then commit the result. # vim test.txt //修改冲突文件,并保存 # git commit -am "remove conflict" //重新提交到本地版本库 # git push //同步到远程