mangos Zero Playerbots Help

[e46ad]

Hello guys could anyone lend me a hand in getting the https://github.com/blueboy/portalzero Playerbots working on my fresh compile of Mangos Zero

Like what would i need to do to merge the to folders together ? is the blueboys Portalzero still working on Mangos ?

I read i have to do

So i start off by Git bash Master and it switches me over to the my Master aka Mangos,

git clone git://github.com/mangoszero/server.git mangos -b Rel 20 --recursive

cd mangos

git pull git://github.com/blueboy/portalzero.git

Then i just get a bunch of errors in git bash saying, Conflict content Merge src/game/CMakelists.txt warning inxact rename dection was skipped duue to too many files, You may want to set your merge.renamelimit variable to at least 1752 and re try,

Automatic Merge failed could anyone lend me a hand please at getting the merge sorted out so i can compile it thank you.