Pull is not possible because you have unmerged files.
来源:互联网 发布:linux应用软件 编辑:程序博客网 时间:2024/05/18 05:51
Pull is not possible because you have unmerged files.
在git pull的过程中,如果有冲突,那么除了冲突的文件之外,其它的文件都会做为staged区的文件保存起来。
重现:
$ git pull
A Applications/Commerce/BookingAnalysis.java
A Applications/Commerce/ClickSummaryFormatter.java
M Applications/CommerceForecasting/forecast/Forecast.java
A Applications/CommerceForecasting/forecast/ForecastCurveProviderCategory.java
M Applications/CommerceForecasting/forecast/ForecastProvider.java
M Applications/CommerceForecasting/forecast/InputPropertyItem.java
......
A Applications/LocalezeImporter/com/tripadvisor/feeds/SingleMenuLocalezeMatcher.java
A Applications/LocalezeImporter/com/tripadvisor/feeds/TypeCategory.java
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'.
通过git status你会发现下面古怪的事情:
zhonghua@pts/ttys000 $ git status
# On branch sns
# Your branch and 'snsconnect/sns' have diverged,
# and have 1 and 52 different commit(s) each, respectively.
#
# Changes to be committed:
#
# new file: src/config/features_daodao.ini
# new file: src/config/services.xml
# new file: src/config/svnroot/hooks/mailer.conf
# new file: src/config/svnroot/hooks/mailer.py
# new file: src/config/svnroot/hooks/post-commit
# new file: src/config/svnroot/hooks/pre-commit
# new file: src/config/svnroot/hooks/prerelease_notifications.py
# new file: src/config/svnroot/hooks/run_checks.py
…….
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# _build/
# css/combined/
# css/gen/
# daodao-site.patch
# daodao-site.patch1
# js/combined/
# js/gen/
# lib/weibo/
# src/bin/
Pull is not possible because you have unmerged files.
解决:
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后形成的引用。
- 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解决方法
- 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:"Pull is not possible because you have unmerged files"
- Pull is not possible because you have unmerged files错误解决!
- git pull报错Pulling is not possible because you have unmerged files
- Git 一些错误的解决方法 Pull is not possible because you have unmerged files.
- is not found. Have you run APT to generate them?
- 解决: is not found. Have you run APT to generate
- the file “XXX” could not be opened because you don't have permission to view it
- the file “XXX” could not be opened because you don't have permission to view it
- 区块链是否已准备好发行法币?银行为何认为加密现金具有巨大前景
- C++中STL对string进行trim,split,replace操作
- 每日区块链:泰晤士高等教育透露学术界正在采用区块链技术;乌克兰政府计划在区块链上拍卖扣押资产
- 欢迎使用CSDN-markdown编辑器
- 杨东:化解ICO与虚拟货币监管难题必须“疏堵结合”
- Pull is not possible because you have unmerged files.
- 【2】ping命令
- 每日区块链:美国政府需要重整IT行业,希望区块链助力;区块链将如何使人们掌握自己的数据
- 博晨技术CEO张健:莫因ICO误伤区块链
- 一些关于函数与变量的预处理和执行的事
- Java代理方式——静态代理和动态代理详解
- IntelliJ Idea 2017 注册码 免费激活方法
- Jetson TX1uboot编译与烧写
- 栈溢出怎么办