nchebrov/azerothcore_installer
1
0
Fork 0
mirror of https://github.com/hermensbas/azerothcore_installer.git synced 2026-01-13 00:28:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update merge_core.sh

Browse Source
This commit is contained in:
bash
2024-08-12 21:04:03 +02:00
committed by GitHub
parent 688c9ed540
commit 29562a0ac2
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
helper/merge_core.sh
View File

@@ -1,6 +1,4 @@
#!/bin/bash
ROOT_DIR="$(cd -P -- "$(dirname -- "$0")" && pwd -P)"
##########################################################################################
# General dependencies
@@ -14,7 +12,7 @@ then
##########################################################################################
# Try to merge from the orginal azerothcore into the playerbot azerothcore fork branch
##########################################################################################
cd ${ROOT_DIR}/../_download/azerothcore
cd ${ROOT_DIR}/_download/azerothcore
git reset --hard origin/Playerbot
git fetch upstream
git merge upstream/master