From 9814d8571af1f18cb06d015a20dcb59e1fa55c15 Mon Sep 17 00:00:00 2001 From: Rochet2 Date: Wed, 24 Sep 2014 20:11:00 +0300 Subject: [PATCH] Update MERGING.md --- docs/MERGING.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/MERGING.md b/docs/MERGING.md index fd6432c..94a53fb 100644 --- a/docs/MERGING.md +++ b/docs/MERGING.md @@ -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