Jump to content
  • 0

[solved] error message merging Mangos



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 :


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




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?

Link to comment
Share on other sites

3 answers to this question

Recommended Posts

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.

Link to comment
Share on other sites


This topic is now archived and is closed to further replies.

  • Create New...

Important Information

We have placed cookies on your device to help make this website better. You can adjust your cookie settings, otherwise we'll assume you're okay to continue. Privacy Policy Terms of Use