@DaViper
I have the same problem like earthwalker. So i have seen your post and use the command 'git pull git://github.com/xeross/mangos.git ahbot' in my mangos folder. But i get following messages
$ git pull git://github.com/xeross/mangos.git ahbot
remote: Counting objects: 172, done.
remote: Compressing objects: 100% (74/74), done.
emote: Total 102 (delta 84), reused 41 (delta 28)Receiving objects
Receiving objects: 79% (81/102)
Receiving objects: 100% (102/102), 46.75 KiB, done.
Resolving deltas: 100% (84/84), completed with 27 local objects.
From git://github.com/xeross/mangos
* branch ahbot -> FETCH_HEAD
Auto-merging src/game/AuctionHouseMgr.cpp
Auto-merging src/game/Chat.cpp
Auto-merging src/game/Chat.h
Auto-merging src/game/Level3.cpp
Auto-merging src/game/Mail.cpp
Auto-merging src/game/Makefile.am
Auto-merging src/game/Player.h
Auto-merging src/game/World.cpp
Auto-merging src/game/World.h
CONFLICT (content): Merge conflict in src/game/World.h
Auto-merging src/mangosd/mangosd.conf.dist.in
Auto-merging win/VC100/game.vcxproj
Auto-merging win/VC80/game.vcproj
Auto-merging win/VC90/game.vcproj
Automatic merge failed; fix conflicts and then commit the result.
What's my failure?
Hexle