Can “git pull” automatically stash and pop pending changes?

前端 未结 5 857
死守一世寂寞
死守一世寂寞 2020-11-21 23:41

I know how to solve this:

user@host$ git pull
Updating 9386059..6e3ffde
error: Your local changes to the following files would be overwritten by merge:
    f         


        
5条回答
  •  甜味超标
    2020-11-22 00:41

    To save few seconds for oncoming explorers, here is a summary (thanks to @VonC):

    git pull --rebase --autostash
    

提交回复
热议问题