From 8b0a89e68f51e3f7b9900454f103af088ae40ee6 Mon Sep 17 00:00:00 2001 From: Rochet2 Date: Wed, 24 Sep 2014 20:09:10 +0300 Subject: [PATCH] Update MERGING.md --- docs/MERGING.md | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/docs/MERGING.md b/docs/MERGING.md index 943482f..fd6432c 100644 --- a/docs/MERGING.md +++ b/docs/MERGING.md @@ -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 `, 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