updating help about trinitycore HOT 4 CLOSED

Not sure if this is the "best" way, but doing it this was fairly painless. Providing specific examples for clarity.

1. get a clone of the TrinityCore repo -> git clone -b 3.3.5 git://github.com/TrinityCore/TrinityCore.git
2. get a clone of this repo (into a different directory)-> git clone https://github.com/thesawolf/TrinityCore.git
3. cd into the thesawolf repo directory
4. add the TrinityCore repo as a remote repo of thesawolf -> git remote add TrinityCore /path/to/repo/TrinityCore
5. fetch the TrinityCore repo -> git fetch TrinityCore
6. merge the TrinityCore repo -> git merge TrinityCore/3.3.5

This should present you with a manageable list of conflicts to resolve.

from trinitycore.

Thank you! I know that this is just some basic branching and merging a local repo but it is helpful. Regarding conflicts, any tips? Is there anything I wouldn't accept from TrinityCore or is it just a case-by-case basis? Thanks.

from trinitycore.

The jist of the changes revolves around bringing the bot code up to date with the changes to TrinityCore, so you're basically always going to accept the TrinityCore changes, and then have to figure out what modifications make sense. For example, the latest merge I did, the TrinityCore folks removed several #define statements that caused alot of compilation errors in the bot code. The proper change would be to go change all the bot code files to remove the defines and call the methods directly. The easy change was to just add the defines back into the TrinityCore file (which is what I did).

Example file in question is: src/server/game/AI/ScriptedAI/ScriptedGossip.h

The defines can be found in the thesawolf version of the file, and then those defines can be copied and appended to the end of the TrinityCore version of the file (in your merged repo).

I believe there were maybe 20 or so other conflict issues and such. Didn't take too long this time.

from trinitycore.

Thanks so much!

from trinitycore.