How to resolve code conflicts caused by submitting PR on github？

github_pr_resolve_conflicts.md

After fork and git clone

fork_url: your forking repo
origin_url: repo forked by you
step.1: Check current origin, it should be fork_url.

git remote -v

step.2: Remove current origin.

git remote remove origin

step.3: Add origin.

git remote add origin origin_url

step.4: Check result origin, it should be origin_url.

git remote -v

step.5: Pull repo.

git pull origin

then resolve conflicts.
step.7: Repeat step.2, 3, 4, it should be fork_url. Then you can commit and push, at this point, they should be pushed to your forking repo.