把相应的文件暂存后,使用git命令先安排 一下
$ git stash
Saved working directory and index state WIP on yx_shop_dev: 664c41c26 Merge "京东退款接口" into yx_shop_prod
ling1@С▒▒Ů▒ķ▒▒▒ MINGW64 /w/ideaWorkPace/dss-wshop (yx_shop_dev)
$ git pull --rebase
Successfully rebased and updated refs/heads/yx_shop_dev.
ling1@С▒▒Ů▒ķ▒▒▒ MINGW64 /w/ideaWorkPace/dss-wshop (yx_shop_dev)
$ git stash pop
然后用签名方式提交,写上备注哈
搞完再命令安排一下
$ git pull
Already up to date.
ling1@С▒▒Ů▒ķ▒▒▒ MINGW64 /w/ideaWorkPace/dss-wshop (yx_shop_dev)
$ git push origin yx_shop_dev:refs/for/yx_shop_dev