未写完的代码(add、暂存(staged))
# 获取提示:
error: Your local changes to the following files would be overwritten by merge:
...
Please commit your changes or stash them before you merge.
Aborting解决办法: 使用 stash
git stash -u #贮藏 stash不会保存为跟踪的文件(untracked,未add的) 所以建议加上-u(包含未跟踪)
git pull
git stash apply/pop #应用贮藏
# 解决冲突..
# 提交