1、打开terminal 2、git pull 3、git pull origin master 4、git pull origin master --allow-unrelated-histories