📅  最后修改于: 2022-03-11 14:49:45.831000             🧑  作者: Mango
git pull origin master --allow-unrelated-histories
then when asked for merging vim editor opens click insert (i) type msg and :wq to save and exit