The situation is like this. Suppose a github is in commit A and the local is also commit A, then I write some new codes locally and arrive at commit B, and then I receive a pull request on github and github arrives at commit C, then I want to synchronize github codes to the local and keep the codes under commit B from being overwritten. What should I do? Seek a solution.
You can directly git pull ah, if there is a conflict, solve the conflict