In clean mangos at the last version:
$ git pull git://github.com/xeross/mangos.git ahbot
remote: Counting objects: 69, done.
remote: Compressing objects: 100% (41/41), done.
remote: Total 45 (delta 34), reused 11 (delta 4)
Unpacking objects: 100% (45/45), done.
From git://github.com/xeross/mangos
* branch ahbot -> FETCH_HEAD
Auto-merging src/game/AuctionHouseHandler.cpp
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.
I don't know how fix the conflicts and commit. All the tutorials are in english, and i understand it. Can you tell the procediment please??