https://trinitycore.atlassian.net/wiki/display/tc/Using+the+script+hotswapping+system#Usingthescripthotswappingsystem-Enablingthehotswapsystem
TrinityCore
选好工作目录,打开git bash
--获取TrinityCore 3.3.5
Type Code: git clone -b 3.3.5 https://github.com/TrinityCore/TrinityCore.git
--进到TrinityCore目录
Type Code: cd TrinityCore
-- 添加子项目库
Type Code: submodules https://github.com/ElunaLuaEngine/ElunaTrinityWotlk.git
Type Code: git submodule init
Type Code: git submodule update
--After the process is done
Type Code: git remote add ElunaTrinityWotlk https://github.com/ElunaLuaEngine/ElunaTrinityWotlk.git
Everything fine, you can now CMake & compile!
下面是更新操作
更新TrinityCore 右键源码文件夹-> Git Bash Here
Type Code: git pull
更新 Eluna Lua Engine, 右键源码文件夹-> Git Bash Here
Type Code: git submodule init
Type Code: git submodule update
Player and item gossip
地址:http://rochet2.github.io/Player-and-Item-Gossip.html 目前有2个版本 3.3.5 和 6.x 选择对应的版本
GIT获取
1.在TrinityCore文件夹上右键open git bash
2.git remote add rochet2 https://github.com/Rochet2/TrinityCore.git
3.git pull rochet2 playeritemgossip
=================================================================================
Git本地有修改如何强制更新
本地有修改和提交,如何强制用远程的库更新更新。我尝试过用git pull -f,总是提示 You have not concluded your merge. (MERGE_HEAD exists)。
我需要放弃本地的修改,用远程的库的内容就可以,应该如何做?傻傻地办法就是用心的目录重新clone一个,正确的做法是什么?
正确的做法应该是:
git fetch --all
git reset --hard origin/master
git fetch 只是下载远程的库的内容,不做任何的合并git reset 把HEAD指向刚刚下载的最新的版本