Update MERGING.md

This commit is contained in:
Rochet2
2014-09-24 20:11:00 +03:00
parent 8b0a89e68f
commit 9814d8571a

View File

@@ -3,14 +3,14 @@ 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
git clone https://github.com/TrinityCore/TrinityCore.git
cd TrinityCore
git pull --recurse-submodules https://github.com/ElunaLuaEngine/ElunaTrinityWotlk.git
```
Steps explained:
1. clone Eluna recursively
* This will automatically pull the submodule (Eluna repo)
1. clone TrinityCore
2. go to the source folder
3. pull (fetch and merge) TC with the Eluna source.
3. pull (fetch and merge) Eluna with the source.
* recurse-submodules will automatically pull the submodule (Eluna repo)
* Adding Eluna core repository as a remote is recommended