git fix conflict

Because of this conflict resolution command, I can't remember it. In order not to search the Internet every time and write it in my blog, I will use my free time to organize the knowledge gained from my web front-end work. Output, hope to help more web front-end practitioners

git pull 代码时会遇到冲突，conflict需要fix conflict
1.解决冲突后，git add 冲突文件
2.git commit -m "添加注释"
3.git merge
4.git status /*查看下本地更改了哪些文件*/
5.git push  /*提交修改到远端仓库*/

Note that the "" quotes inside are all in English