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
2017-03-15 23:50:47 +02:00
committed by GitHub
parent 98d2137f20
commit 655e1a2a94
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
docs/MERGING.md
View File

@@ -1,4 +1,4 @@
#Merging Eluna # Merging Eluna
Eluna can be added to various sources by applying the core changes required for Eluna to function. Eluna can be added to various sources by applying the core changes required for Eluna to function.
Below you find the guides for merging Eluna with each core or a fork of it. Below you find the guides for merging Eluna with each core or a fork of it.
If you choose to merge you should be able to maintain and update yourself - we do not maintain your core. View Unofficial Merging below. If you choose to merge you should be able to maintain and update yourself - we do not maintain your core. View Unofficial Merging below.
@@ -7,13 +7,10 @@ We also do not fix any merging errors you may have, but you are free to ask abou
We recommend using the [installation guide](INSTALL.md) especially if you are not familiar with git and updating the code. We recommend using the [installation guide](INSTALL.md) especially if you are not familiar with git and updating the code.
It allows you to simply use `git pull` followed by `git submodule update` to update your source and we will handle the merging and maintenance with the official core source. Naturally you still need to handle updating the database as instructed by the core's wiki or instructions. It allows you to simply use `git pull` followed by `git submodule update` to update your source and we will handle the merging and maintenance with the official core source. Naturally you still need to handle updating the database as instructed by the core's wiki or instructions.
###Unofficial Merging ### Merging Eluna with MaNGOS
We do not support unofficial merging. View [Unofficial Merging](http://emudevs.com/showthread.php/5000) thread.
###Merging Eluna with MaNGOS
Eluna is merged with [official MaNGOS](http://getmangos.eu/) by default. Eluna is merged with [official MaNGOS](http://getmangos.eu/) by default.
###Merging Eluna with cMaNGOS ### Merging Eluna with cMaNGOS
``` ```
git clone https://github.com/cmangos/mangos-wotlk.git git clone https://github.com/cmangos/mangos-wotlk.git
cd mangos-wotlk cd mangos-wotlk
@@ -29,7 +26,7 @@ Steps explained:
* [Eluna cMaNGOS TBC](https://github.com/ElunaLuaEngine/ElunaMangosTbc) * [Eluna cMaNGOS TBC](https://github.com/ElunaLuaEngine/ElunaMangosTbc)
* [Eluna cMaNGOS WotLK](https://github.com/ElunaLuaEngine/ElunaMangosWotlk) * [Eluna cMaNGOS WotLK](https://github.com/ElunaLuaEngine/ElunaMangosWotlk)
###Merging Eluna with TrinityCore ### Merging Eluna with TrinityCore
``` ```
git clone https://github.com/TrinityCore/TrinityCore.git -b3.3.5 git clone https://github.com/TrinityCore/TrinityCore.git -b3.3.5
cd TrinityCore cd TrinityCore