Git冲突:# If this is not correct, please remove the file # .git/MERGE_HEAD

简介: Git冲突:# If this is not correct, please remove the file # .git/MERGE_HEAD

问题


Git提交发生了冲突,是我不曾修改的部分发生的冲突,所以具体不清楚怎么去描述,先看截图吧

2019052900021781.png


部分翻译截图:

20190529000257351.png

解决问题


看到问题和翻译,明显可以看到,git告诉我们冲突已经修复了,但是我还停留在修复冲突的那个阶段,但是呢我实际看到的还是有冲突,这时呢,就要再去看一下截图了。我们能够注意到 这个文件有问题.git/MERGE_HEAD,并且git告诉我们,如果还有问题请删除该文件,


所以我就去找到.git/MERGE_HEAD文件,并删除

20190529000749340.png

再次运行git命令。会发现冲突解决,一切顺利。


目录
相关文章
|
2月前
|
Shell 网络安全 开发工具
fatal: unable to access 'https://github.com/wolfcw/libfaketime.git/': Encountered end of file
fatal: unable to access 'https://github.com/wolfcw/libfaketime.git/': Encountered end of file
|
4月前
|
开发工具 git
unable to index file ‘~$git提交版本号.xlsx‘
unable to index file ‘~$git提交版本号.xlsx‘
|
5月前
|
开发工具 git
*** Please tell me who you are.Run git config --global user.email “you@example.com“ git confi
*** Please tell me who you are.Run git config --global user.email “you@example.com“ git confi
|
6月前
|
移动开发 jenkins 持续交付
解决jenkins、git拉取代码仓库失败Please make sure you have the correct access rights
解决jenkins、git拉取代码仓库失败Please make sure you have the correct access rights
93 3
|
6月前
|
开发工具 git
git报错 Unable to create ‘D:/project/xxx/.git/index.lock‘: File exists.
git报错 Unable to create ‘D:/project/xxx/.git/index.lock‘: File exists.
273 1
|
开发工具 git
git报错,error: You have not concluded your merge (MERGE_HEAD exists). hint: Please,
git报错,error: You have not concluded your merge (MERGE_HEAD exists). hint: Please,
155 0
|
Shell 开发工具 git
(极简解决)git commit 时出现:please enter the commit message for your changes
(极简解决)git commit 时出现:please enter the commit message for your changes
886 0
|
开发工具 数据安全/隐私保护 git
git 报错:Support for password authentication was removed. Please use a personal access token instead.
git 报错:Support for password authentication was removed. Please use a personal access token instead.
382 0
git 报错:Support for password authentication was removed. Please use a personal access token instead.
|
开发工具 git
git报错:usage: git remote remove <name>(使用git remote rm origin 报错)
git报错:usage: git remote remove <name>(使用git remote rm origin 报错)
123 0
|
开发工具 git
error: could not lock config file .git/config: Permission denied/Command failed with exit 255
error: could not lock config file .git/config: Permission denied/Command failed with exit 255
380 0