使用 git 应用补丁
每次我尝试使用 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".
请帮助我
Everytime i try to apply a patch using git i get this error:
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".
Please help me
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论
评论（1）
您的工作目录中有本地更改，如下所示：
提交、重置或存储这些更改，然后继续。
You have local changes in your working directory as indicated by:
Commit, reset or stash these and then continue.