應用使用Git

-1

每次補丁我嘗試使用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".

請幫我

來源

2012-02-08 Kris Valas

你有沒有在你的樹的未提交的變化？ 'git status'是什麼意思？ – 2012-02-08 03:46:03

您是否嘗試閱讀錯誤？它告訴你爲什麼它無法應用該補丁。 – Cascabel 2012-02-08 05:37:57

您的工作目錄中的局部變化所指示：

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

提交，重置或隱藏這些然後繼續。

來源

2012-02-08 04:30:31 manojlds

回答

相關問題