I am trying to setup a new server with the patch from VladimirMangos in his previous post:
https://gist.github.com/1068763
But I cannot seem to apply it after I have pulled in the Playerbot changes.
I tried applying the patch prior to the Playerbot merge via:
git pull git://github.com/blueboy/portal.git master
But now that command fails with this error:
From git://github.com/blueboy/portal
* branch master -> FETCH_HEAD
error: Your local changes to 'src/game/CMakeLists.txt' would be overwritten by merge. Aborting.
Please, commit your changes or stash them before you can merge.
Which I am not surprised. There is a merge issue either way.
Any pointers to allow both AH bot and Playerbot to merge properly in the latest revision?