hi bluboy
I use git extensions so look what happened when i pull-merge your repository
c:\\Program Files (x86)\\Git\\cmd\\git.cmd pull "git://github.com/blueboy/mangos.git" +refs/heads/master:refs/heads/master
From git://github.com/blueboy/mangos
+ 70d4dae...e9ad275 master -> master (forced update)
Warning: fetch updated the current branch head.
Warning: fast forwarding your working tree from
Warning: commit 70d4daec5414947b1abdca8fd3e1ba4fc6ed7753.
Already up-to-date.
I am going to tree and see that the merge had done in 9390
Doing the same with ahbot
c:\\Program Files (x86)\\Git\\cmd\\git.cmd pull "git://github.com/Naicisum/mangos.git" +refs/heads/ahbot:refs/heads/ahbot
From git://github.com/Naicisum/mangos
* [new branch] ahbot -> ahbot
From git://github.com/Naicisum/mangos
* [new tag] ahbot-mangos-v0.14 -> ahbot-mangos-v0.14
* [new tag] ahbot-mangos-v0.15 -> ahbot-mangos-v0.15
Auto-merging src/game/Level3.cpp
Auto-merging src/game/Mail.cpp
Auto-merging src/game/Player.cpp
Auto-merging src/game/Player.h
Auto-merging src/game/World.cpp
Merge made by recursive.
README.AHBOT | 179 ++++
sql/characters_auctionhousebot.sql | 95 ++
sql/characters_auctionhousebot_update.sql | 44 +
src/game/AuctionHouseBot.cpp | 1487 +++++++++++++++++++++++++++++
src/game/AuctionHouseBot.h | 979 +++++++++++++++++++
src/game/AuctionHouseHandler.cpp | 13 +-
src/game/AuctionHouseMgr.cpp | 4 +-
src/game/AuctionHouseMgr.h | 3 +
src/game/Chat.cpp | 1 +
src/game/Chat.h | 1 +
src/game/Level3.cpp | 471 +++++++++
src/game/Mail.cpp | 19 +-
src/game/Makefile.am | 2 +
src/game/Player.cpp | 55 ++
src/game/Player.h | 1 +
src/game/World.cpp | 5 +
src/mangosd/mangosd.conf.dist.in | 73 ++
win/VC100/game.vcxproj | 2 +
win/VC80/game.vcproj | 8 +
win/VC90/game.vcproj | 8 +
20 files changed, 3444 insertions(+), 6 deletions(-)
create mode 100644 README.AHBOT
create mode 100644 sql/characters_auctionhousebot.sql
create mode 100644 sql/characters_auctionhousebot_update.sql
create mode 100644 src/game/AuctionHouseBot.cpp
create mode 100644 src/game/AuctionHouseBot.h
Done
the merge now did with mangos 9407
I thought that this is problem with git extentions but I read somewhere in mangos that after player bot merge you need to reset the git
Now i made first a new branch and then pull merge blueboy git. It is merged with 9407. Your direction to make new branch is right.
I had conflicts with creature ... why you put again the bot giver?
thanks for the answer!
good work