Conflicting codes cannot be rolled back

The code is submitted using SourceTree software, and the modification of the project.config.json file is detected.
Do not want to commit this edit.
1. Use SourceTree software to discard, but cannot discard
2. Use vscode development tool to withdraw, cannot withdraw
3. Use git command, restore cannot
4. Paste online code to replace local, once saved, it will automatically change back to the previous one, which needs to be submitted.

Finally, with the help of the boss, it was found out that it was a problem with the vscode editor.
My computer has two vscode editors installed. One has been deleted.

Guess you like

Origin blog.csdn.net/qq_43907534/article/details/124388728