yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update MERGING.md

Browse Source
This commit is contained in:
Rochet2
2014-09-24 20:09:10 +03:00
parent 0c72883009
commit 8b0a89e68f
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
docs/MERGING.md
View File

@@ -1,10 +1,16 @@
#Merging
1. You should have/get the source code of TrinityCore or MaNGOS.
2. Open `git bash` in the source folder.
3. Create a remote to our Eluna core repository with `git remote add Eluna <repoaddress>`, for example for TC WoTLK it would be
`git remote add Eluna https://github.com/ElunaLuaEngine/Eluna-TC-Wotlk.git`.
4. Pull (fetch and merge) the eluna core repository to your TC or MaNGOS source with `git pull Eluna master`.
5. Open `git bash` and do
`git submodule init`
`git submodule update`
6. Compile the core normally (use cmake if needed)
#Merging Eluna with MaNGOS
Eluna is already merged with official MaNGOS by default
#Merging Eluna with TC
```
git clone --recursive https://github.com/ElunaLuaEngine/ElunaTrinityWotlk.git
cd ElunaTrinityWotlk
git pull https://github.com/TrinityCore/TrinityCore.git
```
Steps explained:
1. clone Eluna recursively
* This will automatically pull the submodule (Eluna repo)
2. go to the source folder
3. pull (fetch and merge) TC with the Eluna source.
* Adding Eluna core repository as a remote is recommended