You have not concluded your merge (MERGE_HEAD exists)
来源:互联网 发布:网络流行语2016搞笑 编辑:程序博客网 时间:2024/06/05 09:23
使用SourceTree Merge分支的时候出现问题:
You have not concluded your merge (MERGE_HEAD exists).Please, commit your changes before you can merge.
然后点击SourceTree的Termianl的时候出现错误:
错误可能是因为在你以前pull下来的代码没有自动合并导致的.
有2个解决办法:
1.保留你本地的修改
git merge --abortgit reset --merge
合并后记得一定要提交这个本地的合并
然后在获取线上仓库
git pull
2.down下线上代码版本,抛弃本地的修改
不建议这样做,但是如果你本地修改不大,或者自己有一份备份留存,可以直接用线上最新版本覆盖到本地
git fetch --allgit reset --hard origin/mastergit fetch
当然还有一个最笨的方法,就是重新clone一份代码,抛弃这个工作目录,方法很笨拙但是效果一样的好。
4 0
- You have not concluded your merge. (MERGE_HEAD exists)。
- You have not concluded your merge. (MERGE_HEAD exists)。
- You have not concluded your merge (MERGE_HEAD exists)
- Git You have not concluded your merge. (MERGE_HEAD exists)
- You have not concluded your merge (MERGE_HEAD exists)
- (git)You have not concluded your merge (MERGE_HEAD exists).
- You have not concluded your merge (MERGE_HEAD exists)
- You have not concluded your merge (MERGE_HEAD exists)
- fatal: You have not concluded your merge (MERGE_HEAD exists).
- git问题:You have not concluded your merge (MERGE_HEAD exists)
- You have not concluded your merge (MERGE_HEAD exists). Please, commit your changes before you can me
- You have not concluded your merge (MERGE_HEAD exists) git拉取失败
- You have not concluded your merge (MERGE_HEAD exists) git拉取失败
- You have not concluded your merge (MERGE_HEAD exists) git拉取失败
- GIT PULL 报错 :You have not concluded your merge (MERGE_HEAD exists).
- git pull失败:You have not concluded your merge (MERGE_HEAD exists)
- You have not concluded your merge (MERGE_HEAD exists) git拉取失败
- You have not concluded your merge (MERGE_HEAD exists) git拉取失败
- c++学习之赋值兼容规则
- 链表和数组的区别
- POJ 3181 Dollar Dayz【递推 拆分存大数】
- 快速排序
- PHP经典抓取网络数据方法
- You have not concluded your merge (MERGE_HEAD exists)
- java 追加内容到文件末尾的几种常用方法
- 【c语言】输出平行四边形图案
- hihoCoder 1037 数字三角形
- [C语言][LeetCode][237]Delete Node in a Linked List
- 黑马程序员 —— 标识符的概念及其命名规则
- NSURLSessionConfiguration之异步请求
- Golang实现ping
- Python3爬虫实战:爬取大众点评网某地区所有酒店相关信息