Jasper Yu says to YSITD
你們要做事先git pull —rebase就沒事惹