05-10-2013, 01:12 AM
Yup, that's called a svn conflict and it happens when two people touch the same file in the same place at the same moment (or don't update the file they're editting).
With Bindings.cpp, it's just easier to delete the file altogether and let the AllToLua generate a new file.
With Bindings.cpp, it's just easier to delete the file altogether and let the AllToLua generate a new file.