使用git应用补丁

Question

每次我尝试使用git应用补丁时都会收到此错误：

C:\Program Files\Git\bin\git.exe am --3way --signoff "C:/Users/KV/Desktop/11189-City-Conquest.patch"
Applying: 11189Conquest
Using index info to reconstruct a base tree...

warning: squelched 481 whitespace errors
warning: 486 lines add whitespace errors.
Falling back to patching base and 3-way merge...
error: Your local changes to the following files would be overwritten by merge:
    src/server/game/Scripting/ScriptLoader.cpp
    src/server/scripts/Custom/CMakeLists.txt
Please, commit your changes or stash them before you can merge.
Aborting
Failed to merge in the changes.
Done
Patch failed at 0001 11189Conquest
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".

请帮帮我

Answer 1

您的工作目录中有本地更改，如下所示：

error: Your local changes to the following files would be overwritten by merge:
    src/server/game/Scripting/ScriptLoader.cpp
    src/server/scripts/Custom/CMakeLists.txt

提交，重置或存储这些内容然后继续。