腹黒い茶
says to
YSITD
rebase 就 git pull --rebase 就好了