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