2018-06-03T18:08:52Z||2018-06-03T18:08:52Z
请加--allow-unrelated-histories
参数,比如:
git merge origin/master --allow-unrelated-histories
2018-06-03T18:08:52Z||2018-06-03T18:08:52Z
请加--allow-unrelated-histories
参数,比如:
git merge origin/master --allow-unrelated-histories