[Git] Fatal: cannot do a partial commit during a merge
来源:互联网 发布:php小型网站源代码 编辑:程序博客网 时间:2024/06/02 02:06
在提交单个文件的时候出现这个错误.
意思是不能部分提交代码.
原因是git认为你有部分代码没有做好提交的准备,比如没有添加
解决方法是
1. 提交全部
git commit -a
2. 如果不想提交全部,那么可以通过添加 -i 选项
git commit file/to/path -i -m "merge"
上述情况一般出现在解决本地working copy冲突时出现, 本地文件修改(手工merge)完成后,要添加并提交,使得本地版本处于clean的状态.
这样以后git pull就不再会报错.
意思是不能部分提交代码.
原因是git认为你有部分代码没有做好提交的准备,比如没有添加
解决方法是
1. 提交全部
git commit -a
2. 如果不想提交全部,那么可以通过添加 -i 选项
git commit file/to/path -i -m "merge"
上述情况一般出现在解决本地working copy冲突时出现, 本地文件修改(手工merge)完成后,要添加并提交,使得本地版本处于clean的状态.
这样以后git pull就不再会报错.
0 0
- [Git] Fatal: cannot do a partial commit during a merge
- git Fatal: cannot do a partial commit during a merge
- [Git] Fatal: cannot do a partial commit during a merge
- [Git] Fatal: cannot do a partial commit during a merge
- Git- Fatal: cannot do a partial commit during a merge
- cannot do a partial commit during a merge
- cannot do a partial commit during a merge.
- 【Git commit错误】 cant not commit a partial during a merge
- Revert a merge commit
- Deleting a git commit
- git中Please enter a commit message to explain why this merge is necessary. Please enter a commit mess
- git commit -a的用法
- How do I use 'git reset --hard HEAD' to revert to a previous commit?
- Git remove a file in a commit
- git commit -a 中的a的意思
- git:Please enter a commit message to explain why this merge is necessary
- Git: How to revert a merge commit that's already pushed to remote branch?
- git中Please enter a commit message to explain why this merge is necessary.
- 【HTML5学习笔记一】环境搭建和需要掌握的技能
- (A^B mod C)|(a^(n!) mod c)
- android获得屏幕高度和宽度的方法
- LeetCode Best Time to Buy and Sell Stock III && Best Time to Buy and Sell Stock IV
- linux文件系统
- [Git] Fatal: cannot do a partial commit during a merge
- 新的一年,新的开始
- Word可以转换成PDF格式的吗
- 自定义导航栏的返回按钮,扩大点击区域,不改变图片的尺寸比例,同时可设置title和image的位置关系
- 天声人語 20150313
- 思科IRDR
- VS2013快捷键及技巧
- 有向图强连通分量_Tarjan
- Python函数式编程指南(三):迭代器