git pull origin master命令后发生冲突
问题说明：
$ git pull origin master
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use ‘git add/rm ’
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
解决方法：
1.git pull会产生merge操作导致冲突，需要将冲突的文件resolve掉之后才能成功pull
所以执行下列命令即可：
git add -u
git commit -m “注释”
git pull
2.放弃本地更改也可以解决冲突
放弃本地更改git reset --hard FETCH_HEAD，其中FETCH_HEAD表示上一次成功pull之后的commit点，然后git pull即可