Odoo中文网|Odoo实施培训
标题: error: merge is not possible because you have unmerged files. [打印本页]
作者: jeffrey 时间: 2018-8-16 14:03
标题: error: merge is not possible because you have unmerged files.
git add .
git commit -a -m “ssss”
git pull origin master
git merge origin/master
然后再执行下面
git push origin master
至此GitHub上就不会再有.DS_Store了成功的表现是:本地有.DS_Store和gitignore文件就可以了,GitHub上有.gitignore 没有 .DS_Store文件。
欢迎光临 Odoo中文网|Odoo实施培训 (http://www.chinaodoo.net/) |
Powered by Discuz! X3.2 |