fatal: refusing to merge unrelated histories 解决方案
来源:互联网 发布:python subprocess pid 编辑:程序博客网 时间:2024/06/04 22:47
问题描述
当本地分支与远程分支没有共同祖先时,会出现 fatal: refusing to merge unrelated histories
的问题。
解决方案
可以使用 rebase
的方式来进行合并。
git pull --rebase origin master
实例验证
可以通过一个小实验来体会一下:
cdmkdir rebaseTmpcd rebaseTmpecho "hello a line" > tmp.txtgit initgit add .git commit -m "Local first commit"git remote add origin https://github.com/HustLion/java_console_log4j.gitgit pull --rebase origin master
得到的结果:
warning: no common commitsremote: Counting objects: 32, done.remote: Compressing objects: 100% (21/21), done.remote: Total 32 (delta 3), reused 28 (delta 2), pack-reused 0Unpacking objects: 100% (32/32), done.From https://github.com/HustLion/java_console_log4j * branch master -> FETCH_HEAD * [new branch] master -> origin/masterFirst, rewinding head to replay your work on top of it...Applying: Local first commit
此时文件结构是:
.├── LICENSE├── README.md├── pom.xml├── src│ ├── main│ │ └── java│ │ ├── com│ │ │ └── hustlion│ │ │ └── java_console_log4j│ │ │ └── App.java│ │ └── log4j2.properties│ └── test│ └── java│ └── com│ └── hustlion│ └── java_console_log4j│ └── AppTest.java└── tmp.txt
可以看到我们的本地 commit 带来的 tmp.txt 与远程项目通过 rebase 很好地合并在了一起。
参考
- Git没有共同祖先的两个分支如何合并?
- git无法pull仓库refusing to merge unrelated histories
- https://stackoverflow.com/a/41765529/4394850
阅读全文
0 0
- fatal: refusing to merge unrelated histories 解决方案
- fatal: refusing to merge unrelated histories的解决方案
- git fatal: refusing to merge unrelated histories
- fatal: refusing to merge unrelated histories
- fatal: refusing to merge unrelated histories
- refusing to merge unrelated histories
- refusing to merge unrelated histories
- git pull 失败 ,提示:fatal: refusing to merge unrelated histories
- 如何去解决fatal: refusing to merge unrelated histories
- [GITgit pull 失败 ,提示:fatal: refusing to merge unrelated histories
- fatal: refusing to merge unrelated histories怎么解决?
- git pull 失败 ,提示:fatal: refusing to merge unrelated histories
- git pull 失败 ,提示:fatal: refusing to merge unrelated histories
- Git Pull Failed: fatal: refusing to merge unrelated histories
- fatal: refusing to merge unrelated histories(git)
- git 报这个错 fatal: refusing to merge unrelated histories
- faial: refusing to merge unrelated histories
- git-bug-“refusing to merge unrelated histories”
- 下论文网址
- python中关于字符串修改的问题
- (撤销)搬家通知!!!
- 无序容器
- NOIP 2004 提高组 复赛 alpha 虫食算
- fatal: refusing to merge unrelated histories 解决方案
- [乐意黎原创]PHP编译时configure: WARNING: unrecognized options: --with-mysql
- 字节序
- 安卓程序加载h5页面
- Python 函数详解
- 史上最全的java spring注解,没有之一
- Labyrinth 【迷宫图中 树的直径应用】
- Android 单例模式引起的内存泄露
- JSP基础增强