The situation is like this, assuming that commit A is in a certain github, and commit A is also committed locally. At this time, I wrote some new code locally and reached commit B. At this time, I received a pull request on github, github When I reach commit C, I want to synchronize the github code to the local while keeping the code under commit B from being overwritten. What should I do? Looking for a solution.
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
You can just git pull directly. If there is a conflict, just resolve the conflict
If you don’t want to be overwritten, just open another branch and pull request. Once your code is written, merge it into the newly opened branch and submit it again