diff options
Diffstat (limited to 'source/AllToLua.bat')
| -rw-r--r-- | source/AllToLua.bat | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/AllToLua.bat b/source/AllToLua.bat index 75a028228..f7867fadb 100644 --- a/source/AllToLua.bat +++ b/source/AllToLua.bat @@ -8,8 +8,10 @@ :: If there was a Git conflict, resolve it by resetting to HEAD; we're regenerating the files from scratch anyway -git checkout -- Bindings.cpp -git checkout -- Bindings.h +git checkout --ours Bindings.cpp +git add -u Bindings.cpp +git checkout --ours Bindings.h +git add -u Bindings.h |