Jump to content

Small question


Guest Tiburan1

Recommended Posts

Can anybody tell me, if i want to add more than one core_mod

With the git pull commands like these

git pull git://github.com/Naicisum/mangos.git ahbot

git pull git://github.com/rastikzzz/mangos.git master

git pull git://github.com/charlie2025/mangos.git outdoor

git pull git://github.com/balrok/mangos.git alterac

if i should add the first mod and than compile, or if its possible to add IE AH_bot / Outdoor_pvp / Alterac

patches all at the same time and than compile

Thanks in advance for any input regarding my question

Kind regards Nick

Link to comment
Share on other sites

Thanks for clearing that out for me :) it is like i suspected

I only found one issue which i'm not pro enough to resolve myself, but again hoping one of you

can enlighten this for me

IE i use git to get the source file

*git://github.com/mangos/mangos.git -----> i than use git bash to apply this patch

*git pull git://github.com/charlie2025/mangos.git outdoor -----> all goes well files merged :) after that i apply

*git pull git://github.com/balrok/mangos.git alterac ------> Same for this one no errors :) after that one i want to

apply this one

*git pull git://github.com/Naicisum/mangos.git ahbot -----> this is the point i'm sruggling with as i recieve a message like this

*"Conflict <content>: merge conflict in srs/game/world.cpp

Auto-merging win/VC100/game.vcxproj

Auto-merging win/VC80/game.vcxproj

Auto-merging win/VC90/game.vcxproj

Automatic merge failed; fix conflicts and than commit the result"

"I have to add i dont have any conflict with the AH_bot patch if i only use the AH_bot patch"

Noob as i am, i'm stuck here (just got into the compiling bizznizz and love it)

Again any help would be much apreciated and i hope for 1 i explained my issue detailed enough

if not i will try to give more information

(i searched for any topic regarding these kind of problems but couldnt find anything related so far. Feel free to flame if i used my ears to search)

Best of regards

Link to comment
Share on other sites

I dont want to sound rude or anything but since nobody here can give me any advice on how to solve this.

Maybee someone can point me to another forum where i might post this

Again i dont want anything chewed out as its a learning process for me, i just need a place to post this / or some hints on where to search, as this is all really new to me

Thanks again and sorry if this sounds a bit harsh

Link to comment
Share on other sites

*"Conflict <content>: merge conflict in srs/game/world.cpp

Auto-merging win/VC100/game.vcxproj

Auto-merging win/VC80/game.vcxproj

Auto-merging win/VC90/game.vcxproj

Automatic merge failed; fix conflicts and than commit the result"

This means that the code trees conflict in such a way that git cannot determine how to merge them safely, and leaves that up to you. This can be very common when mixing code trees, and fixing it might be very hard or very easy, depending on how much the code from the different trees mix with each other. In this case, it is fairly easy:

#include "GMTicketMgr.h"
#include "Util.h"
<<<<<<< HEAD:src/game/World.cpp
#include "OutdoorPvPMgr.h"
=======
#include "AuctionHouseBot.h"
>>>>>>> 8be8d5a61ae512b310e83ed62152ed80584f7f05:src/game/World.cpp

INSTANTIATE_SINGLETON_1( World );

This is taken from the file referenced in the error message. When git is unable to merge changes, it leaves the code from the previous version between <<<<<<< HEAD:Path and =======, and the code to be merged in between ======= and >>>>>>> (commit id:Path). Here, the programmer has to determine whether to keep the old code, the new code, or perhaps both. If you consider what codebases you have merged, you should be able to come up with the answer :)

When done, remove the lines introduced by git ( <<</>>>/=== ) and commit. Now you should be ready to compile, or even merge in additional branches!

Good luck!

Link to comment
Share on other sites

×
×
  • 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