- merge操作会更新改动的文件的标记,所以不能用discard来忽略改动
如果discard了,可以用checkout指定分支的文件来解决
git checkout --
Created
October 13, 2018 03:09
-
-
Save jesliwang/5da5cb22bb23268f113262cfb05bd354 to your computer and use it in GitHub Desktop.
使用git的时候,遇到的问题
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment