git: Auto Merge Failed; Fix Conflicts and Then Commit the Result.
来源:互联网 发布:3d实景地图 知乎 编辑:程序博客网 时间:2024/06/05 06:18
协同开发时,我们从远程服务器上pull下代码的时候,出现以下提示信息:
Auto Merge Failed; Fix Conflicts and Then Commit the Result.
2.原因分析:
利用git status,输出如下:
root@hyk-virt:/etc# git status
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 2 and 2 different commits each, respectively.
#
# Unmerged paths:
# (use "git add/rm ..." as appropriate to mark resolution)
#
# both modified: apt/sources.list
#
# Changes not staged for commit:
# (use "git add ..." to update what will be committed)
# (use "git checkout -- ..." to discard changes in working directory)
#
# modified: cups/subscriptions.conf
# modified: cups/subscriptions.conf.O
# modified: mtab
# modified: update-manager/release-upgrades
#
no changes added to commit (use "git add" and/or "git commit -a")
从git status的结果可以发现:其中sources.list这个文件存在合并冲突
而进一步分析git pull的原理,实际上git pull是分了两步走的,(1)从远程pull下origin/master分支(2)将远程的origin/master分支与本地master分支进行合并
以上的错误,是出在了第二步骤
3.解决方法
方法一:如果我们确定远程的分支正好是我们需要的,而本地的分支上的修改比较陈旧或者不正确,那么可以直接丢弃本地分支内容,运行如下命令(看需要决定是否需要运行git fetch取得远程分支):
$:git reset --hard origin/master
或者$:git reset --hard ORIG_HEAD
解释:
git-reset - Reset current HEAD to the specified state
--hard
Resets the index and working tree. Any changes to tracked files
in the working tree since are discarded.
方法二:我们不能丢弃本地修改,因为其中的某些内容的确是我们需要的,此时需要对unmerged的文件进行手动修改,删掉其中冲突的部分,然后运行如下命令
$:git add filename
$:git commit -m "message"
方法三:如果我们觉得合并以后的文件内容比价混乱,想要废弃这次合并,回到合并之前的状态,那么可以运行如下命令:
$:git reset --hard HEAD
- git pull报错:Auto Merge Failed; Fix Conflicts and Then Commit the Result.
- git pull报错:Auto Merge Failed; Fix Conflicts and Then Commit the Result.
- git pull报错:Auto Merge Failed; Fix Conflicts and Then Commit the Result
- git: Auto Merge Failed; Fix Conflicts and Then Commit the Result.
- git pull报错:Auto Merge Failed; Fix Conflicts and Then Commit the Result.
- git 使用场景一,pull报错:Auto Merge Failed; Fix Conflicts and Then Commit the Result.
- git常见问题之git pull时Automatic merge failed; fix conflicts and then commit the result.
- 芒果iOS开发之 CONFLICT (content): AutoMatic merge failed;fix conflicts and then commit the result.
- Fix git “not currently on any branch” after merge conflicts
- merge conflicts in Git
- 【Git】git rebase+fix conflict+git add+git rebase --continue或git merge+fix conflict+git add+git commit
- Auto Merge Failed 解决方案
- Non-transactional data access and the auto-commit mode
- Non-transactional data access and the auto-commit mode
- Git Commit failed
- git merge错误:“No commit specified and merge.defaultToUpstream not set”
- Git Commit failed with error The Git process exited with the code -1,073,741,819
- git add and commit
- 文章标题
- 使用pip
- maven 思维导图
- binder 详详详详详详解
- css3中的垂直居中布局(垂直或居中)
- git: Auto Merge Failed; Fix Conflicts and Then Commit the Result.
- Android中MVC、MVP、MVVM模式的运用
- 从cellspacing和cellpadding看HTML属性与CSS属性的使用
- 主键 外键
- mysql:如何将命令行结果数据输出到文本文件
- memcached 缓存命中率
- Java面试题—equals和==的区别
- 类似直播App的向右滑动清屏功能
- unity代码示例和碰撞检测