From 7b9f812f756aba0fd96be20d036d918945e38495 Mon Sep 17 00:00:00 2001 From: Rochet2 Date: Sat, 12 Apr 2014 17:00:41 +0300 Subject: [PATCH] Create MERGING.md --- docs/MERGING.md | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 docs/MERGING.md diff --git a/docs/MERGING.md b/docs/MERGING.md new file mode 100644 index 0000000..943482f --- /dev/null +++ b/docs/MERGING.md @@ -0,0 +1,10 @@ +#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)