I tried to build a new version yesterday and the build is failing. This is part of my build log:
I have no idea what happened or how to fix it. Thanks, in advance, for any tips/suggestions on how to solve the problem. If more info is needed, please let me know what it is, and probably how to get it. I seem to be out of my depth here.
Code:
update:
[exec] Updating '.':
[exec] Skipped 'src/data/defaults.txt' -- Node remains in conflict
[exec] At revision 20779.
[exec] Summary of conflicts:
[exec] Skipped paths: 1
svn-version:
gitsvn-version:
version:
[echo] Current revision: 20764:20779M
daily:
svn-version:
gitsvn-version:
version:
[echo] Current revision: 20764:20779M
I have no idea what happened or how to fix it. Thanks, in advance, for any tips/suggestions on how to solve the problem. If more info is needed, please let me know what it is, and probably how to get it. I seem to be out of my depth here.