Front-end - Questions about submitting merge code on webstrom?

Question

The code on my server is correct, but there is an error in the local code. I want to merge the code on the local and the server. The merge is successful, no error or conflict is prompted, but the code on the server cannot be merged. The server is still correct, but the local one is still wrong. I would like to ask what is the problem?
Thank you!

Answer 1

Ignore the information you provided and don’t know what your local and server conditions are.
Maybe your local server content is not updated with the server.
You can fetch remote first to pull the server content back to the local and then merge.

But according to your needs, you can only merge the commit once.

git log [文件名] # 查看这个文件的修改历史
git show [commit] #查看历史
git cherry-pick [commit] #仅merge一个特定的commit