ZHL's Blog

1.在git的使用过程中突然报错Pull is not possible because you have unmerged files.Please, fix them up in the work tree, and then use 'git add/rm <file>'as appropriate to mark resolution, or use 'git comm...

git切换分支首先通过$ git branch -a 来查看所在目录的分支$ git branch -a master* trunk remotes/origin/HEAD -> origin/master remotes/origin/master remotes/origin/zhanghanlun然后输入命令切换分支$ git ch...