1 files changed, 25 insertions, 3 deletions
diff --git a/source/AllToLua.bat b/source/AllToLua.bat
index 584f57423..75a028228 100644
--- a/source/AllToLua.bat
+++ b/source/AllToLua.bat
@@ -1,3 +1,25 @@
-"tolua++.exe" -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
-
-if %ALLTOLUA_WAIT%N == N pause
+
+:: AllToLua.bat
+
+:: This scripts updates the automatically-generates Lua bindings in Bindings.cpp / Bindings.h
+
+
+
+
+
+:: 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
+
+
+
+
+
+:: Regenerate the files:
+"tolua++.exe" -L virtual_method_hooks.lua -o Bindings.cpp -H Bindings.h AllToLua.pkg
+
+
+
+
+
+if %ALLTOLUA_WAIT%N == N pause