使用git合并两个不同项目时报如下错
$ git pull https://gitee.com/pardon110/Laravel_Vue_GraphQL.git master
From https://gitee.com/pardon110/Laravel_Vue_GraphQL
* branch master -> FETCH_HEAD
fatal: refusing to merge unrelated histories
查看了相关文档,需要加上配置项,
--allow-unrelated-histories
$ git pull https://gitee.com/pardon110/Laravel_Vue_GraphQL.git master --allow-unrelated-histories
From https://gitee.com/pardon110/Laravel_Vue_GraphQL
* branch master -> FETCH_HEAD
Merge made by the 'recursive' strategy.
LICENSE | 191 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
README.md | 37 ++++++++++++
2 files changed, 228 insertions(+)
create mode 100644 LICENSE
create mode 100644 README.md
查看,将远程的master分支成功合并到本地分支
Administrator@PC-20141122KRMZ MINGW64 /d/laragon323/www/lar55 (lar55_api_graphQL)
$ head README.md
# Laravel_Vue_GraphQL
#### 项目介绍
采用laravel框架graphql实现 api数据驱动
#### 软件架构
软件架构说明
#### 安装教程