git 解决merge文件冲突

今天用git pull origin master的文件，结果由于很久没有pull了，里面存在很对更改，和本地更改冲突了，这个时候提醒

branch              master     -> FETCH_HEAD
   d08d9f65..4780b796  master     -> origin/master
Auto-merging src/components/home/system-management/system-settings/attendance-set.vue
CONFLICT (content): Merge conflict in src/components/home/system-management/system-settings/attendance-set.vue
Automatic merge failed; fix conflicts and then commit the result.` 

因为使用的是vscode，所以手动在vscode里面进行了merge，保留了自己需要的内容；
回来后，自我认为应该继续pull一下，结果继续报错

 E:\FirstMap\web\tems_web> 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 <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
```看了下提醒，因为merge完了以后，需要将你本地的merge进行提交
执行





<div class="se-preview-section-delimiter"></div>

git add .
git commit -m “daf”
git push
“`
这样把冲突解决完，就可以继续下面的操作了。
这是本人这次遇到的冲突解决办法，希望对各位有所帮助！！！