[solved] error message merging Mangos

[rumpilstilskin]

Hello all !

Nice to see the mangos community back and active on this new forum !

I would appreciate your help concerning an error message merging mangos.

I have the following message :

Aborting

error: The following untracked working tree files would be overwritten by merge:

src/game/AuctionHouseBot/AuctionHouseBot.cpp

src/game/AuctionHouseBot/AuctionHouseBot.h

src/game/AuctionHouseBot/ahbot.conf.dist.in

Please move or remove them before you can merge.

I want to update my server from 401 to 404 UDB version. AuctionHousebot is no longer on my server since version 399!

Thanks for any advise !

-----> I guess I should remove these files.

It means I can't keep the AuctionHousebot files in standby if I wish one day to put them back ingame?

[VladimirMangos]

Look like by error you can just drop its from your repo before merge do:

git rm src/game/AuctionHouseBot/AuctionHouseBot.*

and same for last. Then make git commit and then do merge.

[added] Ah, i miss "untracked". Then this fiels not in repo but just exoist as files in directory. Above command will remove its anyway but follow commit will not required possible.

[Nighoo]

"ActionHouseBot" was commited to our repository some time ago. When you removed it from your clone it looks like you didn't tell git about that.

[rumpilstilskin]

Thank you. Just erased the mentionned files... don't know how to update with Git.

completed my uptade to version 404... but it won't work

going to look for help on the french topic... might be a little easyer for me^^

Thanks for your help!