Licson Lee
says to
Ow< [MSFW]
然後 git pull 再 git stash pop 以後他會嘗試 auto merge