[英]git pull isn't possible, there are unmerged files
# save your changed files in a stash that behaves like a stack
git stash
# Pull changes from upstream
git pull origin master
# get the changed files from stash and apply to the current branch
git stash apply
声明:本站的技术帖子网页,遵循CC BY-SA 4.0协议,如果您需要转载,请注明本站网址或者原文地址。任何问题请咨询:yoyou2525@163.com.