本地拉取远端git pull出错:
> 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 commit -a'
如果想放弃本地的文件修改,可以使用git reset --hard FETCH_HEAD,FETCH_HEAD表示上一次成功git pull之后形成的commit点。然后git pull就OK了。
.gitconfig配置:
[alias]
co = checkout
ci = commit
ci0 = commit -a --allow-empty-message -m ''
st = status
br = branch
pl = log --pretty=oneline
rpl = reflog --pretty=oneline
back = reset --hard