Look at the prompts. The server-side changes are not merged locally. Look at the prompts again and just merge them. If you want to find out the reason, finally install a git client program, enter git bash, and look at git status to understand.
Brother on the first floor gave a good answer. You can try to see if the local and remote versions are inconsistent. After merging, it should be finepush. Give it a try
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
Look at the prompts. The server-side changes are not merged locally. Look at the prompts again and just merge them. If you want to find out the reason, finally install a git client program, enter git bash, and look at git status to understand.
Brother on the first floor gave a good answer. You can try to see if the local and remote versions are inconsistent. After merging, it should be fine
push. Give it a tryBrother, I have a suggestion. You can use the command, which is convenient and fast, or there is a tool called sourcetree, which is also very useful