git 常见报错 - 走看看

zoukankan html css js c++ java

git 常见报错
1. refusing to merge unrelated histories : 拒绝合并无关的历史

teminal中输入
```
 git pull origin master --allow-unrelated-histories
```
2. Automatic merge failed; fix conflicts and then commit the result. : 自动合并失败，文件存在冲突文件

teminal中输入
```
git status
```
我的terminal输出
```
On branch master
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:

	new file:   README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both added:      9B189104-4E9C-4A19-8592-E40E09454EE8.codesnippet
	both added:      A4EDA56B-0221-48B7-B6F1-EDDA4ED3EFBA.codesnippet
	both added:      C0C3AF9F-0A73-4EC4-8550-4E12748F6D43.codesnippet
```
错误信息中提示：不能合并的路径为
1. 9B189104-4E9C-4A19-8592-E40E09454EE8.codesnippet
2. A4EDA56B-0221-48B7-B6F1-EDDA4ED3EFBA.codesnippet
3. C0C3AF9F-0A73-4EC4-8550-4E12748F6D43.codesnippet
三个文件，用xcode打开文件修改文件，保留最新版本。提交文件修改到远程仓库。

友情链接:

技术博客简书主页
查看全文

相关阅读:
Go 映射 (map)
Go 字节 (byte) & 文字符号 (rune)
Go 数组(array) & 切片(slice)
Go 字符串 (string)
Go 变量(var) & 常量(const)
Go 循环 (for)
Go 函数
 Go package: strings
Linux crontab (定时任务)
Python gc

原文地址：https://www.cnblogs.com/tig666666/p/8484035.html

Copyright © 2011-2022 走看看