Git 一些错误的解决方法 Pull is not possible because you have unmerged files.
来源:互联网 发布:淘宝助手打印快递单 编辑:程序博客网 时间:2024/05/29 13:10
1. Pull is not possible because you have unmerged files.
症状:pull的时候
$ Git pull
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'
应该是因为local文件冲突了
解决方法:
引用――
“
1.pull会使用git merge导致冲突,需要将冲突的文件resolve掉 git add -u, git commit之后才能成功pull.
2.如果想放弃本地的文件修改,可以使用git reset --hard FETCH_HEAD,FETCH_HEAD表示上一次成功git pull之后形成的commit点。然后git pull.
注意:
git merge会形成MERGE-HEAD(FETCH-HEAD) 。git push会形成HEAD这样的引用。HEAD代表本地最近成功push后形成的引用。
”
就我的经验,有时候会莫名其妙地出现这种状况,而且Untracked files 还特别多(实际上自己可能只改了一两个文件),所以只好先保存好自己确定做出的local的修改,然后用git reset --hard FETCH_HEAD回到上次成功pull之后的点,然后再pull就没有问题了
2.You are not currently on a branch.
症状:有一次pull的时候又出现冲突,这回用“git reset --hard FETCH_HEAD”方法都不行了,出现:
$ git pullYou are not currently on a branch, so I cannot use any'branch.<branchname>.merge' in your configuration file.Please specify which remote branch you want to use on the commandline and try again (e.g. 'git pull <repository> <refspec>').See git-pull(1) for details.
解决方法:
首先git checkout -b temp
其次git checkout master
即可恢复到master repository的状态,然后就可以pull了
- Git 一些错误的解决方法 Pull is not possible because you have unmerged files.
- Git:"Pull is not possible because you have unmerged files"
- git报错:Pull is not possible because you have unmerged files解决方法
- Pull is not possible because you have unmerged files
- Pull is not possible because you have unmerged files.
- Pull is not possible because you have unmerged files.
- Git:"Pull is not possible because you have unmerged files"
- git pull报错Pulling is not possible because you have unmerged files
- Pull is not possible because you have unmerged files错误解决!
- Cocoapods Error "Pull is not possible because you have unmerged files." #1268
- Cocoapods error: “Pull is not possible because you have unmerged files.”
- Cocoapods error: “Pull is not possible because you have unmerged files.”
- Cocospod Error Pull is not possible because you have unmerged files
- Cocospod Error Pull is not possible because you have unmerged files
- Git fetch和git pull的区别, 解决Git报错:error: You have not concluded your merge (MERGE_HEAD exists).
- Git fetch和git pull的区别, 解决Git报错:error: You have not concluded your merge (MERGE_HEAD exists).
- Eclipse使用GIT进行pull时候的错误 : The current branch is not configured for pull
- git push updates were rejected because the remote contain works that you do not have
- Python入门
- 一个简化版的SSH后端框架demo,支持接口、页面开发
- 【Away3D代码解读】(一):主要类及说明
- 人工智能要闻: 沃尔玛用机器人取代数千岗位, 腾讯开AI加速器, 猎户星空获微软人脸识别有限制类第一名
- tcp协议_mss
- Git 一些错误的解决方法 Pull is not possible because you have unmerged files.
- java导出csv文件
- 121. Best Time to Buy and Sell Stock
- hdu2222(AC自动机)
- 查找:基本概念
- tomcat使用localhost可以访问,使用本机ip不能访问
- VMware Authorization Service不能启动 VMware虚拟机状态已挂起无法恢复解决方案
- C++ typename的起源与用法
- POJ 3670 Eating Together(LIS+nlogn算法)